added gmail model/datasource
merged