Dammit
Merge branch 'master' of https://github.com/DuChemin/MEIMassaging

Conflicts:
	massage/massage/frontEnd/views.py