added flat views
Merge branch 'master' of https://github.com/elpassion/flatmate