Sync version as brunch does not support async onCompile yet
Version bump
Typo
Merge branch 'master' into develop

Conflicts:
	package.json
Version bump + changelog