commit
Merge branch 'master' of https://github.com/raychensg/Yellowfin

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi