Codekit config
Merge branch 'develop' into feature/compass

Conflicts:
	config.codekit