Merge branch 'release/1.0.2' into develop
Back to development: 1.0.3
Merge branch 'develop' of https://github.com/syslabcom/osha.hwc2014