Changed templates and some views
Merge branch 'develop' of https://github.com/purdue-epics-ims/ims2014 into develop