added font-awesome, extended view templates, simplified
Merge branch 'master' of github.com:catelevator/catelevator