fixed merge conflicts, added updates for dingo/api
Merge branch 'master' of github.com:Cysha/PhoenixCMS