updating
Merge branch 'master' into develop
updated folder names for consistency to googlecalapi
Finish Release-2