de tatie
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/default/views/scripts/pagini/contact.phtml