wtf
Merge remote-tracking branch 'origin/master'

Conflicts:
	Summer-Android/AndroidManifest.xml
	Summer-Android/src/summer/android/Login.java