Updated CHANGES
Merge branch 'develop' into feature/rest-api