Restaurant Map Google
Merge branch 'master' of https://github.com/zvitek/lobkowicz-umbrella

Conflicts:
	www/umbrella/js/control.js