Small options fix in FormBuilder

Conflicts:
	config/parameters.yml
Added moxie plupload as a vendor