to pull from github in home ;
Merge branch 'master' of https://github.com/wenxiang20130910/Demo_app

Conflicts:
	bin/AndroidManifest.xml
	src/com/example/demo_app/MainActivity.java