---
Merge branch 'master' of https://github.com/czarek1986/GPMaps

Conflicts:
	PracujMaps.Web/PracujMaps.Web.csproj
	PracujMaps.Web/Scripts/angular.js