Fix template bug and links in views and templates
Merge branch 'master' of github.com:yurios/DocumentReady