added new weather maps
table test und map zoom fix
added map weater features
ROBIN HAT COOLE MAPS AM START
Merge branch 'master' of https://github.com/Harryson/Web-Tech

Conflicts:
	play_seapal/Seapal/app/views/_include/header_app.scala.html
Merge branch 'markus7' of https://github.com/Harryson/Web-Tech
tolle sache
map route im entstehen
Merge branch 'master' of https://github.com/Harryson/Web-Tech

Conflicts:
	play_seapal/Seapal/public/javascripts/app/map/map.js
	play_seapal/Seapal/public/javascripts/app/map/map_routes.js
scheiße
endlich
Merge branch 'master' of https://github.com/Harryson/Web-Tech

Conflicts:
	play_seapal/Seapal/app/controllers/Trip.java
	play_seapal/Seapal/app/views/trip.scala.html
	play_seapal/Seapal/app/views/tripinfo.scala.html
cooool