Merge branch 'release/0.2' 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 'develop'