Pulled many new changes from CCL including an advanced css.
Merge branch 'master' into gh-pages

Conflicts:
	core