conversation and messaging
Merge branch 'master' of
https://github.com/riccardotommasini/tbsview.git

Conflicts:
	res/layout/item_notification_received.xml