version 0.1
Fixed merge conflicts, version 0.2
Merge branch 'master' into develop

Conflicts:
	js/init.js