Added first version of map.
Merge branch 'master' of github.com:nfqakademija/webtaxi

Conflicts:
	app/Resources/scripts/concat.json