Views fixed on master.
Merge branch 'master' of https://github.com/ldevesine/Calvin