add couponActivity
solve conflicts
Merge branch 'master' of https://github.com/irisgeek/subway_android.git

Conflicts:
	subway/gen/com/subway/R.java
	subway/res/values/strings.xml
Merge pull request #8 from longjunye/master

solve conflicts