Merge branch 'master' into develop
add controller tests
Merge branch 'develop'