Merge branch 'master' into develop
Merge branch 'master' into develop
Corrected wrong twitter handle.
Merge branch 'develop'