Upgraded django to 1.6
Merge branch 'master' of github.com:CodeCatz/actifaction
adding back the templates file