user management
Merge origin/master
conflict management
conflict management
conflict management
Merge branch 'master' of https://github.com/barif/Meeting

Conflicts:
	.gitignore