Signup
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/parse/starter/R$color.class
	bin/classes/com/parse/starter/R$drawable.class
	bin/classes/com/parse/starter/R$id.class
	bin/classes/com/parse/starter/R$layout.class
	bin/classes/com/parse/starter/R$string.class
	bin/classes/com/parse/starter/R.class
	gen/com/parse/starter/R.java
	res/layout/main.xml
	res/values/strings.xml
ok
Revert "nothing"

This reverts commit 8a8624bca9b3e64f365a8af0afdee077d208f585.