Merge branch 'hotfix/0.1'
asdasdasdasdasd
asd
Merge branch 'hotfix/0.2' into develop

Conflicts:
	file2