update log
Merge branch 'master' of https://github.com/power--/GoPartyAndriodApp

Conflicts:
	GoPartyApp/AndroidManifest.xml
	GoPartyApp/gen/com/goparty/app/R.java
	GoPartyApp/src/com/goparty/app/Login.java