Merge remote-tracking branch 'origin/master'

Conflicts:
	css/images/bg.jpg