add coupon page
and changes
solve conflicts
merge all the change until now
add splash activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	subway/AndroidManifest.xml
	subway/gen/com/subway/R.java
	subway/res/layout-hdpi/activity_meals.xml
	subway/res/layout-xhdpi/activity_meals.xml
	subway/res/values/strings.xml
	subway/src/com/subway/activity/MenuActivity.java
	subway/src/com/subway/util/Constant.java
Merge pull request #6 from longjunye/master

solve conflicts