Optimized for pyinstaller
Merge branch 'master' of https://github.com/markusmichel/Tworpus-Client

Conflicts:
	tworpus/templates/base.html