Sync
Merge branch 'master' of https://github.com/donniebrandt/www.bgsync.com

Conflicts:
	app/controllers/ConversationController.php
	app/models/ConversationUnpackerJson.php
	app/models/ConversationUnpackerXml.php
	app/views/messages/show.blade.php