Added git ignore
Merge branch 'release/1.0'
Fixed position.
Merge branch 'hotfix/h0001' into develop