Adds new Views
Merge branch 'master' into vicente
Fixs Linker errors
Adds New class controller