Merge branch 'feature/contents' into develop
Merge remote-tracking branch 'sharp/master' into develop
Updates-120614
Merge pull request #9 from annaszekely/feature/Updates120614

Feature/updates120614