Merge branch 'release/Issue#1' into develop
Merge branch 'hotfix/Issue#17' into develop
Merge branch 'hotfix/Issue#18' into develop
q!
q
Merge branch 'hotfix/Issue#19' into develop
Merge branch 'hotfix/Issue#19v2' into develop
Merge branch 'hotfix/Issue#21' into develop

Conflicts:
	sorame_bot.pl
Merge branch 'master' into develop
Progress Issue#21v2
Progress Issue#21v3
Merge branch 'release/Issue#21v3'