Revert "rollback"

This reverts commit f7a9f2051469c9a9c3529ed805d3af754f5e8b7e.
update
Merge branch 'master' of https://github.com/hadimuhammad/InPress

Conflicts:
	inPress/module/views.pyc