#472, #479 Web API and tests modifications
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev