Merge branch 'develop'
Update of hsn2-framework submodule.