Added github code
Added google maps
Merge origin/master
Added google maps
Added google maps
Merge origin/master

Conflicts:
	src/main/webapp/js/directives.js
	src/main/webapp/partials/geomap.html
Merge origin/master
Merge origin/master

Conflicts:
	src/main/webapp/js/directives.js
	src/main/webapp/partials/geomap.html
Merge origin/master

Conflicts:
	src/main/webapp/js/directives.js
	src/main/webapp/partials/geomap.html