Adding Red to mix

Need to judge if it is good
Merge remote-tracking branch 'origin/master'

Conflicts:
	services.html