syncronize with web
Merge branch 'master' of github.com:eadsimone/klimaire