upgrade to play 2.3
Merge branch 'upgrade_play_2_3' into dev

Conflicts:
	app/models/Conversation.scala