delete all
Merge branch 'master' of https://github.com/Magicsnail/micro_plan

Conflicts:
	res/menu/main.xml