Changing files t o include new 1.5 user model.
Merge branch 'master' of github.com:zmasek/pendvisor
Some minor changes to template loading.