Responsibility changes and changes for hosting on Webfaction
Merge branch 'master' into develop
Correct settings for beta site on Webfaction
Generalized the settings.py file

STATIC_ROOT is the only difference and will be extracted into another
file that is not part of this repository
Merge branch 'develop'
static_root.py must be imported!!
Merge branch 'develop'
Undo last commit
Corrected static_root
Removed PSQL database ... we still go with a sqlite database.
Merge branch 'master' of https://github.com/strongs-de/strongs
Merge branch 'master' of https://github.com/strongs-de/strongs