.
Merge branch 'master' of github.com:AlexBarauskas/rovar2

Conflicts:
	static/js/map.api.js