edit : Member ---> User
Merge branch 'master' of https://github.com/conductor-tutti/tutti

Conflicts:
	app/controllers.py