Updated templates for Django 1.6 compatibility
Merge branch 'master' of http://github.com/altran/Awesome-Competence-System