added feature - tests required
can now submit keyId when getting a conversation
Merged 'dev'.

Conflicts:
	app/controllers/ConversationController.scala
	app/models/Conversation.scala
	test/ConversationControllerSpec.scala
Finish submit_keyid