Fix for Mario - plus fix to the JES
Merge branch 'uct2015Core' of https://github.com/uwcms/UCT2015 into uct2015Core

Conflicts:
	python/emulation_cfi.py