im
Ignore this commit.
Merge branch 'master' of
ssh://git@github.com/ratinmalkud/PowerSearch.git

Conflicts:
	PowerSearch/bin/PowerSearch.apk
	PowerSearch/bin/dexedLibs/android-support-v4-56b05d4cb53dc77145097a2e4016c934.jar
	PowerSearch/bin/dexedLibs/android-support-v4-c108dcde8aa469c53fa9612d42bd9ae9.jar
	PowerSearch/bin/dexedLibs/annotations-0b89145dc3b18e47da3507f5467bdffe.jar
	PowerSearch/bin/dexedLibs/annotations-38a429d9c0f04dde2e09c06128310e8b.jar
	PowerSearch/bin/resources.ap_
	PowerSearch/res/layout/activity_text_screen1.xml
axA