added rule to merge latest master to dev
Added hotfix option
Merge branch 'test'