Merge branch 'release_1.1' into develop
Added feature 6
Fixed conflicts
Added new functions
Added feature 7
Merge branch 'feature7' into develop
Updated version release
Merge branch 'release_1.2'