Just - restructured SSRO code
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/bell/Events.py