Merge remote-tracking branch 'dillon/master'
Merge remote-tracking branch 'dillon/master'

Conflicts:
	src/ElVis/Core/CMakeLists.txt
Merge remote-tracking branch 'origin/master'