Merge branch 'develop' of https://github.com/v-eliseev/HMS-JQ into develop
tests updated