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
Test button and collect without Robot and collect using robot seem to be
working nice
In the middle of moving from CUR stand alone to CUR as tab....

Work in Progress
Manage to find a solution which doesn't crash. Problem on keyword oneway
on updateChannels function on Collect.py
No idea why
After several hours of developing we manage to syncronize two toggle
buttons...
More development done on CUR