Merged 'dev'.

Conflicts:
	app/index.html
create addNewRecipient Function
update recipient handling
beginn with newConversation Update
Merge branch 'origin/feature-messaging'
Merged 'dev'.
moep
Merge branch 'origin/feature-messaging'

Conflicts:
	app/comps/conversations/conversationModel-srvc.js
commit
Merge branch 'origin/feature-messaging'
merge commit
add recipientModel
add updateConversation to API
Merge branch 'origin/feature-messaging'