first step towards real views
Merge branch 'master' of github.com:step21/poerelief

merge remote minimal changes