#588 reconstruct DB when upgrading
#589 use wrapper function to save conversation event
#589 fix wrong cbc id when saving conversation events
#589 fix conversation_event when adding contacts locally
Merge branch 'feature-20141002-video-crop' into feature-20141006-group-chat
#589 cleanup
#601 Experimental checkin