Merge branch 'hotfix-2.2.15'
RestSearch can now return a json (both attribute and event) fixes #233

- also a whitelisting issue fixed
- tag search field not set now correctly returns all events regardless of tags
Merge branch 'hotfix-2.2.16' into develop
Update to cakephp