Deleted odd View folder - Cake 3 alpha structure
Merge branch 'dev'