Merge branch 'hotfix/0.1.1'
Merge branch 'release/0.2.0'

Conflicts:
	Modulefile
Merge branch 'release/0.3.0'
config.js template
Merge branch 'hotfix/0.3.1' into develop