adding prettyphoto
Merge branch 'master' of https://github.com/pmgm/stationery_portal

Conflicts:
	tpl/edit.html
merging changes