Diagramm hinzugef�gt
[Reinhold]
[Reinhold]
-in Register "Weathermap" Diagramme hinzugef�gt
-map.js erweitert und formatiert
Merge branch 'master' of https://github.com/ReSeSe-Gruppe7/Seapal

Conflicts:
	public/javascripts/app/map/map.js
Merge branch 'master' of https://github.com/ReSeSe-Gruppe7/Seapal