Merge branch 'master' into develop
Added web controller.
Merge branch 'develop'