restructing with angular
Merge branch 'master' of https://github.com/StefanPanait/pgb_oneshop

Conflicts:
	index.html
	js/map.js
	views/map.hb