Merge https://github.com/ycswaves/yamatoV09

Conflicts:
	client/config/commonOpts.js
	client/config/formOpts.js
	client/config/propertyConfig.js