added new weather maps
table test und map zoom fix
Merge branches 'master' and 'markus7' into markus7
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