fixes #15
week edit for admins
Merge branch 'dev'

Conflicts:
	package.json