add unfinished updated views and tpl files
Merge branch 'master' of https://github.com/TJIntranet/intranet3

.