Added leaflet functionality
Merge branch 'master' of https://github.com/frebro/power

Conflicts:
	less/main.less