short answer results part A
Merge branch 'master' of https://github.com/hadimuhammad/inpress

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