Update composer.json
ignored the environment specific configs
removed the themes into their own repositories
adding the themes back via the composer.json
fixed merge conflicts, added updates for dingo/api
Merge branch 'master' of github.com:Cysha/PhoenixCMS
updated configs for dingo/api upgrades
added the updates