merging branch jphernandez
contact form ready on frech