Lots of Changes

styling history page and sorted out various backend issues
Merge branch 'master' of https://github.com/pmgm/stationery_portal

Conflicts:
	tpl/history.html
resolving history changes