Merge branch 'release_1.0'
Merge branch 'release_1.1'
Added hotfix 1
Update version release
Added feature 6
Fixed conflicts
Added new functions