Adding weather controller.
Resolving merge conflict.
merge master
tidy up and logging