some updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	crossfitThemeResponsive/js/scripts.js