update to codekit with sass and js compilation
Merge branch 'codekit' of https://github.com/vc27/ChildTheme

Conflicts:
	addons/initiate-addons.php