Merge branch 'master' into develop
End of integration with views
Merge branch 'develop'