Merge branch 'release_1.0' into develop
Added feayute 4 and unit
Merge branch 'feature4' into develop (added feature 4 + unit)
Added feayute 5
Merge branch 'feature5' into develop
Added release 1.1
Merge branch 'release_1.1'