去除冲突标签
Merge branch 'master' of https://github.com/DerekGrant/devfest2014
修改google-apis https:// 为//
Merge branch 'master' of https://github.com/DerekGrant/devfest2014
fixed https reverse proxy problem by replacing maps.api.gdgdocs.org with maps.dushu.hu