Added a master.txt
Update master.txt
Merge remote-tracking branch 'origin/development'
updated ver
hotfix by HT
confirmed
merged hotfix conflict
Merge branch 'hotfix-v1.1' into development