Add map management
Add map management
Add map management
Merge branch 'master' of https://github.com/mavgh/venere-deals-app

Conflicts:
	www/js/app.js
	www/js/app/models/memory/theme.js
	www/js/app/views/Home.js
	www/js/app/views/HotelList.js