contacct + about
Merge remote-tracking branch 'origin/master'

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