Merge branch 'dev'

Conflicts:
	wp-content/themes/sublimeradio/css/main.css