comitted
Merge branch 'master' of https://github.com/Naiqin/TheSkyMan

Conflicts:
	AndroidManifest.xml
	gen/com/theskyman/R.java
	res/layout/activity_display_message.xml
	res/layout/activity_main.xml
	res/menu/display_message.xml
	res/values/strings.xml
	src/com/theskyman/DisplayMessageActivity.java