Added codekit
Merge branch 'develop'

Conflicts:
	config.codekit