Added menu
Merge branch 'frank-refactoring' of https://github.com/draca/storageapp into frank-refactoring

Conflicts:
	app/controllers/user_controller.php