Staging a merge conflict
Merge remote-tracking branch 'remotes/origin/master' into dev

Conflicts:
	BaseCode.cpp