base-form

add base-form
Merge remote-tracking branch 'origin/master'

Conflicts:
	ccms/global-variable.less
	component.html