actionbar menu
Merge branch 'master' of https://github.com/Hirosuwa/StudyGeneral

Conflicts:
	res/menu/main.xml