#579 Created Web API tests for testing getting of options + small fixes
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev