Merge branch 'release/0.2' into develop
Updated txt files
Merge branch 'master' into develop
Added debug settings
Updated release
Merge branch 'hotfix/debug-settings'
Merge branch 'hotfix/debug-settings' into develop
Merge from django-simple-template master
Merged debug settings into live
Merge branch 'master' of github.com:kamante/django-simple-template into develop
Fixed index.html. Updated fabfile with minor fix
Merge branch 'hotfix/welcomepage'
Updated fabfile
Merge branch 'hotfix/0.1.2'
Merge branch 'master' of github.com:kamante/django-simple-template into develop
Merge branch 'release/0.2.1'