added views from old project, created controllers
Merge branch 'master' into tables