Merge remote-tracking branch 'origin/CPTheme' into CPTheme

Conflicts:
	Themes/CP2014/Content/styles.css
	Themes/CP2014/config.rb
more changes