add a new activity
Merge branch 'master' of https://github.com/cocross/cocross_android

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/cocross/cocross_android