add some view
Merge branch 'master' of https://github.com/frydsh/Rowing

Conflicts:
	gen/com/game/rowing/R.java
	src/com/game/rowing/GameActivity.java
	src/com/game/rowing/MainMenuView.java