Merge branch 'release/1.0' into develop
added new feature to work in group mode
added new feature to merge
Merge branch 'release/1.1'