Implemented ratings for ShopProxy
Updated the map so it will show a window when you click on a specific shop-marker.
Conflict-fixing
Merge branch 'master' of https://github.com/markus-git/webapp.git
Merge branch 'master' of https://github.com/markus-git/webapp.git
Added a Marker for current location in maps.