share party
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/html/controllers/party-waiting.html
share party commenté