updated views
Merge branch 'master' of github.com:ehzhang/jade