Merge remote-tracking branch 'origin/master'

Conflicts:
	skin/frontend/ultimo/default/css/styles.css