#601,#602 integrate video crop and local surface view media change
#602 dynamically set local surface view
#588 reconstruct DB when upgrading
#589 use wrapper function to save conversation event
#602 local surface view now working
#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