Small fix
Merge branch 'release-1.0'
Merge branch 'release-1.0' into develop
hotfix message
Merge branch 'hotfix-1.0.1' into develop
Feature 2 msg
Rename dir and file
Merge branch 'featured_2' into develop