Maybe fixed pilatus pb - to be tested next MDT
Merge branch 'devel'
PEP compliance
Made the code clearer to avoid "Energy" which might be interpreted as a
motor
ISPyB machine changed to Test server (pydevcz.esrf.fr)
Made sure the XML is produced immediately
Graph -> BsxGraphBrick
Small change
Moved to BsxGraphBrick
Clean up (no eclipse warnings)
Ready for a week of data taking
Put in type and number of proposal account
Putting in a reset in case we can not take data with pilatus
New feature on "Collect using robot". Calibration's templates have been
implemented to choose the most used experiments for calibration (BSA,
water and behenate)
Added a new column on CUR (AKA: Collect Using Robot) called
macromolecule
From now, CUR will be "Collect Using Robot"
Merge branch 'devel'
Mode velopment on calibration in CUR
New feature:
	- Changing the default folder when users login
New Feature: 
- Abort event sent to ISPyB (under development)
Merge branch 'master' into biosaxs

Conflicts:
	Bricks/CollectBrick.py
	ControlObjects/Collect.py