rearranged
Merge branch 'master' of https://github.com/ShowcaseSoftwareLtd/showcase-data-api