update views
Merge branch 'master' of https://github.com/choonster/ams