メニュー追加
Merge branch 'master' of https://github.com/gon5on/base-application.git

Conflicts:
	src/com/example/baseapplication/activity/MainActivity.java