config update
Merge branch 'v-01-dev' into v-01

Conflicts:
	config.codekit