diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp
index b1c1c4f2b7..b5719c20b6 100644
--- a/Core/FileSystems/ISOFileSystem.cpp
+++ b/Core/FileSystems/ISOFileSystem.cpp
@@ -512,7 +512,11 @@ std::vector<PSPFileInfo> ISOFileSystem::GetDirListing(std::string path)
 	{
 		TreeEntry *e = entry->children[i];
 
+<<<<<<< HEAD
 		if(e->name == "." || e->name == "..") // do not include the relative entries in the list
+=======
+		if(!strcmp(e->name.c_str(), ".") || !strcmp(e->name.c_str(), "..")) // do not include the relative entries in the list
+>>>>>>> upstream/master
 			continue;
 
 		PSPFileInfo x;
diff --git a/Core/HLE/sceImpose.cpp b/Core/HLE/sceImpose.cpp
index 7e8875206f..3735a28861 100644
--- a/Core/HLE/sceImpose.cpp
+++ b/Core/HLE/sceImpose.cpp
@@ -61,6 +61,7 @@ const HLEFunction sceImpose[] =
 	{0x381bd9e7, 0, "sceImposeHomeButton"},
 	{0x24fd7bcf, &WrapU_UU<sceImposeGetLanguageMode>, "sceImposeGetLanguageMode"},
 	{0x8c943191, &WrapU_UU<sceImposeGetBatteryIconStatus>, "sceImposeGetBatteryIconStatus"},
+	{0x72189C48, 0, "sceImposeSetUMDPopup"},
 };
 
 void Register_sceImpose()
diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp
index 4828943414..4c0135258c 100644
--- a/GPU/GLES/TextureCache.cpp
+++ b/GPU/GLES/TextureCache.cpp
@@ -529,7 +529,7 @@ void PSPSetTexture()
 			match = false;
 
 		//TODO: Check more clut parameters, compute clut hash
-		if(match && (format >= GE_TFMT_CLUT4 || format <= GE_TFMT_CLUT32) &&
+		if(match && (format >= GE_TFMT_CLUT4 && format <= GE_TFMT_CLUT32) &&
 			(entry.clutformat != clutformat ||
 		     entry.clutaddr   != GetClutAddr(clutformat == GE_CMODE_32BIT_ABGR8888 ? 4 : 2) ||
 			 entry.cluthash   != Memory::Read_U32(entry.clutaddr)))
@@ -568,7 +568,7 @@ void PSPSetTexture()
 	entry.hash = *(u32*)texptr;
 	entry.format = format;
 
-	if(format >= GE_TFMT_CLUT4 || format <= GE_TFMT_CLUT32)
+	if(format >= GE_TFMT_CLUT4 && format <= GE_TFMT_CLUT32)
 	{
 		entry.clutformat = clutformat;
 		entry.clutaddr = GetClutAddr(clutformat == GE_CMODE_32BIT_ABGR8888 ? 4 : 2);
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 0b87bbeb57..4d35c262a9 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -1,7 +1,7 @@
 // NOTE: Apologies for the quality of this code, this is really from pre-opensource Dolphin - that is, 2003.
 
 
-#define programname "PPSSPP v0.1"
+#define programname "PPSSPP v0.2"
 
 
 #include <windows.h>
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index c6ced2ce58..4ddf4a2f95 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.ppsspp.ppsspp"
     android:versionCode="1"
-    android:versionName="0.1" >
+    android:versionName="0.2" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8"/>
     
diff --git a/android/jni/MenuScreens.cpp b/android/jni/MenuScreens.cpp
index f1458b0b9c..6332910f22 100644
--- a/android/jni/MenuScreens.cpp
+++ b/android/jni/MenuScreens.cpp
@@ -147,7 +147,7 @@ void MenuScreen::render() {
 
 	ui_draw2d.DrawTextShadow(UBUNTU48, "PPSSPP", dp_xres + xoff - w/2, 80, 0xFFFFFFFF, ALIGN_HCENTER | ALIGN_BOTTOM);
 	ui_draw2d.SetFontScale(0.7f, 0.7f);
-	ui_draw2d.DrawTextShadow(UBUNTU24, "V0.1", dp_xres + xoff, 80, 0xFFFFFFFF, ALIGN_RIGHT | ALIGN_BOTTOM);
+	ui_draw2d.DrawTextShadow(UBUNTU24, "V0.2", dp_xres + xoff, 80, 0xFFFFFFFF, ALIGN_RIGHT | ALIGN_BOTTOM);
 	ui_draw2d.SetFontScale(1.0f, 1.0f);
 	VLinear vlinear(dp_xres + xoff, 95, 20);
 
@@ -353,7 +353,7 @@ void CreditsScreen::update(InputState &input_state) {
 
 static const char *credits[] =
 {
-	"PPSSPP v0.1",
+	"PPSSPP v0.2",
 	"",
 	"",
 	"A fast and portable PSP emulator",
diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png
index abeaeb03d1..99e96d00e2 100644
Binary files a/android/res/drawable-hdpi/ic_launcher.png and b/android/res/drawable-hdpi/ic_launcher.png differ
diff --git a/android/res/drawable-ldpi/ic_launcher.png b/android/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 99238729d8..0000000000
Binary files a/android/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png
index ca22624667..75f936ed1d 100644
Binary files a/android/res/drawable-mdpi/ic_launcher.png and b/android/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png
index 23c28c112a..d59290c61b 100644
Binary files a/android/res/drawable-xhdpi/ic_launcher.png and b/android/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..3fe685c43e
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_launcher.png differ