commit to pull
Merge branch 'master' of github.com:SulivanDotEu/natagora

Conflicts:
	app/logs/dev.log
Merge branch 'master' of github.com:SulivanDotEu/natagora

Conflicts:
	app/logs/dev.log
User registration with eleve one to one relation + email as usernam by default