dev version 3
rebased
feature 1.2 ready
merge from feature-1
feature 1.3 local
feature 1.3.1 local
feaure 1.3.2 local
dev version 4
Merge remote-tracking branch 'origin/development' into feature-1