closes #5
Merge branch 'master' into 5-service-page

Conflicts:
	settings.py
	static/scripts/base.js
Merge branch 'master' into 5-service-page
email changed to username
Merge pull request #38 from dchaplinsky/5-service-page

5 service page