ControllerView testclass
Merge branch 'master'
OutputttehhhViewwaahh
Views (minor) changes
Merge branch 'MJ'