Merge branch 'master' into dev-stylus

Conflicts:
	config.codekit
Added test css file

Conflicts:
	config.codekit