Merge commit '0949f652ee2e84ef46d12ac692620286925ded6e'
* commit '0949f652ee2e84ef46d12ac692620286925ded6e':
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.