Merge remote-tracking branch 'origin/maya' into Fabrizio

Conflicts:
	FinalHTMLCSS/css/application.css
NewApplication css

css new
Change

app
NewApplication CSS
NewApplication

Application CSS
New CSS

css -form
Merge remote-tracking branch 'origin/Fabrizio' into maya