Merge pull request #13 from Crystalnix/Django_Templates

Django templates
Merge branch 'master' into Pagination