Update user module
Merge branch 'master' of git://github.com/MidnightDesign/admin-module

Conflicts:
	composer.json