Chenge "main menu"
Merge branch 'master' of https://github.com/sovanny/Mapus

Conflicts:
	res/layout/settings.xml