#4 Feature for later
Merge remote-tracking branch 'origin/4_feature_for_later' into dev
Merge remote-tracking branch 'origin/hotfix-1.0' into dev
#5 Final feature
revert 4 feature
Changed version to 1.1.