a
Merge branch 'hotfix/controller_fix' into develop

Conflicts:
	readme.txt
Merge branch 'hotfix/shouldhotfixgobacktomaster' into develop
test
a
Merge branch 'hotfix/fixaheadissue_hotfix_001' into develop
Merge branch 'hotfix/fixahead_hotfix_003' into develop
Merge branch 'hotfix/aa' into develop
Merge branch 'hotfix/fixahead_hotfix_004' into develop
Merge branch 'hotfix/fixaheadhotfix005' into develop
Merge branch 'hotfix/fixaheadhotfix_006' into develop
a
Merge branch 'release/0.3'