Merge pull request #6 from longjunye/master

solve conflicts
integrate code

integrate code
optimize menu

optimize menu
Merge branch 'master' of https://github.com/irisgeek/subway_android.git

Conflicts:
	subway/gen/com/subway/R.java
	subway/res/values/strings.xml