Merge branch 'contact'
test change
changed chat code
fixed error
more contact us changes
Merge branch 'contact'

Conflicts:
	css/custom.css
Merge branch 'contact'

Conflicts:
	css/custom.css
update
Merge branch 'contact'
Merge branch 'contact'
Merge branch 'master' into contact