modularized the main view. now weather html code resides in a separate file
Merge branch 'master' of https://github.com/kirillseva/NoBot

Conflicts:
	weather-demo/app/controllers/CalendarC.scala
	weather-demo/conf/routes