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

Feature/updates120614
Merge commit 'faa86e21ef4ae8f6620faedf8f66f3ae416e0eb2'