fix parcel demo
Merge branch 'master' into openshift

Conflicts:
	cfs/parcel.js