Minor changes
Merge branch 'master' of https://github.com/CBSAdvisor/cbs-quantum

Conflicts:
	HStart/HStart.v11.suo
	VfSpeaker/VfSpeaker.v11.suo