change by dev20 for contact form
Merge remote-tracking branch 'origin/master'

Conflicts:
	skin/frontend/ultimo/default/css/local.css
Merge remote-tracking branch 'origin/master'
change done by dev20 for contact form
Merge pull request #100 from raviosc/developer20

change by dev20 for contact form