no message
Merge branch 'gh-pages' of https://github.com/chernikov-v/gloria into gh-pages

# By vodkin38 (4) and Drengr (2)
# Via vodkin38
* 'gh-pages' of https://github.com/chernikov-v/gloria:
  Map functionality moved to separate service
  Map - multiple destinations added
  Images' url fix
  Add icons to tabs
  --
  Map JSON now gets pulled from external server, changed map template title

Conflicts:
	css/style.css
	js/controllers.js