Merge branch 'hotfix/welcomepage' into develop
Merge branch 'hotfix/0.1.2' into develop
Updated live settings with ALLOWED_HOSTS
Updated live settings
Merge branch 'master' of github.com:kamante/django-simple-template