Merge branch 'hotfix/setup_travis' into develop
updateObject method in controller: from private to protected
Merge branch 'release/v1.1.0.2'