cg-70: update bower.json
cg-70: accidentally added leaflet js from my own installation
cg-70: Updated index.html to reference the correct js-resources
Merge branch 'cg-70' into develop

Conflicts:
	app/templates/skeleton/bower.json