fixes #115
Merge branch 'dev.115' into develop

Conflicts:
	perma_web/perma/urls.py
	perma_web/perma/views/service.py