Fix template settings
Fix mainapp views naming inconsistencies
Merge branch 'master' of https://github.com/srct/advisor