Merge branch 'master' into develop
Merge branch 'master' into develop
added package.json
modified package.json
Merge branch 'release/v0.0.1'
Merge branch 'master' of https://github.com/SvenKube/Artists-Theme-CMS