created main activity xml file (lucia)
Merge remote-tracking branch 'origin/master'

Conflicts:
	ParseStarterProject/bin/classes/com/parse/starter/R$menu.class