rexolved merge conflicts, rudimentary admin interface
Merge branch 'master' of https://github.com/mjseaman/shiatsu