20112012 sources
fixed Erecon plotting problem
Merge branch 'master' of https://github.com/hickerson/UCNA
Merge branch 'master' into 2011/2012

Conflicts:
	Scripts/launchers/GeantSimManager.py