Merge branch 'release/v1.0'
Merge branch 'release/v2.0'
Merge branch 'hotfix/v1.1'

Conflicts:
	story.cmd
Merge branch 'hotfix/v1.1'

Conflicts:
	story.cmd
Merge branch 'release/2.1'

Conflicts:
	story.cmd
Merge branch 'master' into develop