вцфвцфв
вцфв
вцфв
вцвц
323
123
dwaddwadwa
Merge remote-tracking branch 'origin/master'

Conflicts:
	Barmaktar-AppEngine/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	Barmaktar/.gitignore
	Barmaktar/AndroidManifest.xml
	Barmaktar/bin/AndroidManifest.xml
	Barmaktar/bin/proguard.txt
	Barmaktar/res/layout/activity_login.xml
	Barmaktar/res/values/strings.xml
	Barmaktar/src/com/barmaktar/GCMIntentService.java
	Barmaktar/src/com/barmaktar/LoginActivity.java
	Barmaktar/src/com/barmaktar/RegisterUserActivity.java
54