stuff
Revert "changed launcher image"

This reverts commit e86d3fba9b5835a09ddcc569d824c73eb2cbf41b.
stuff
asd
Login page completed
asd
Merge branch 'master' of https://github.com/m3h3di/talkieBeta

Conflicts:
	BeshtoTalkie/AndroidManifest.xml
	BeshtoTalkie/bin/classes/com/beshtotalkie/LoginActivity$LoginTask.class
	BeshtoTalkie/bin/classes/com/beshtotalkie/LoginActivity.class
	BeshtoTalkie/bin/classes/com/beshtotalkie/R$drawable.class
	BeshtoTalkie/bin/classes/com/beshtotalkie/R$id.class
	BeshtoTalkie/bin/classes/com/beshtotalkie/R$layout.class
	BeshtoTalkie/bin/classes/com/beshtotalkie/R$menu.class
	BeshtoTalkie/bin/classes/com/beshtotalkie/R$string.class
	BeshtoTalkie/bin/classes/com/beshtotalkie/R$style.class
	BeshtoTalkie/bin/classes/com/beshtotalkie/RegistrationActivity.class
	BeshtoTalkie/bin/dexedLibs/android-support-v4-b36c56200db9b32f86466de97a0aaad6.jar
	BeshtoTalkie/bin/dexedLibs/asmack-android-16-0.8-240a55f4808822c582781ba05ed37f3e.jar
	BeshtoTalkie/gen/com/beshtotalkie/R.java
	BeshtoTalkie/res/layout/button_blue.xml
	BeshtoTalkie/res/layout/button_green.xml
	BeshtoTalkie/res/layout/edittext.xml
	BeshtoTalkie/res/layout/login.xml
	BeshtoTalkie/res/values/strings.xml
	BeshtoTalkie/src/com/beshtotalkie/LoginActivity.java