startactivity
Merge branch 'master' of https://github.com/jerryofouc/AmazingMiniSkirt

Conflicts:
	AmazingClient/AndroidManifest.xml