Edited form elements on work request.
Merge branch 'master' of https://github.com/Kombicorp/marePortal

Conflicts:
	assets/styles/custom/mare_styles.css
	views/site/propertymanagement.handlebars