updates
Merge branch 'master' of https://github.com/kulinsj/PecuMaps

Conflicts:
	MEDIUM/assets/www/MenuScreen.html