work on feature8
quick commit
work on feature8.1
testing 8.1
fix bug and retest
Merge branch 'feature/feature8.1' into feature/feature8
Merge branch 'feature/feature8' into develop
feature6.1 finished
feature6 work
feature6.1 integrated
Merge branch 'feature/feature6.1' into feature/feature6
Merge branch 'feature/feature6' into develop
work on feature7
finish feature7
Merge branch 'feature/feature7' into develop
work
finish feature 10
Merge branch 'feature/feature10' into develop
feature9 is short
feature12