hfd fdj
Merge branch 'test' into develop
hfd fdj
Merge branch 'test' into develop
hello
Merge branch 'test' into develop
Bumped version number to 1.2
Merge branch 'release-1.2'