menu stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/menu/main.xml
reverting some mismergers
* menu stuff working better now
* included latest sample database in assets