#571. Web API and API separated.
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev