s
Merge branch 'master' of https://github.com/hadimuhammad/InPress

Conflicts:
	inPress/inPress/__init__.pyc
	inPress/inPress/settings.pyc