Merge pull request #1 from edx-solutions/mjevtic/workbranch

Looking great - a couple of things that I've discovered when testing, I'm going to log some defects to help us track addressing them.
UI string review for google docs and calendar

DOC-1294
Merge pull request #2 from edx-solutions/markhoeber-studio-UI-review

UI string review for google docs and calendar
Fixed problems with calendar ID field