commiting dev
added mf3.txt to myfeature
Merge branch 'myfeature' into develop
Bumped version number to 1.2
Merge branch 'release-1.2'