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

Conflicts:
	inPress/inPress/urls.pyc
	inPress/module/views.pyc