updated view templates
Fixed application header scripts
Merge branch 'master' of github.com:Egogre/project-x