re-brench
prototyp
Merge remote-tracking branch 'origin/Feature#95_GoogleMaps' into Feature#78_AttributeTypesList

Conflicts:
	Gemfile
	app/views/datasets/show.html.erb
	config/settings/development.yml
#78 - Zobrazit typy atributov v zozname (Prenesená)