Merge proposals dependent on lp://qastaging/~gs.clearcorp/openerp-ccorp-addons/7.0_project_gdrive

1. 7.0_project_gdrive
2. Dependent merge proposals