Added DB functionality and Menus
Merge branch 'master' of git://github.com/haveacupofchai/aamras

Conflicts:
	bollymaps/res/layout/main.xml