add menus
Merge branch 'master' of https://github.com/Cobbalobb/phonegap-start

Conflicts:
	www/js/db.js
db.js