Fixed google map test bug
Merge branch 'master' of https://github.com/GrimmDevelop/Main

Conflicts:
	public/assets/bower.json