Nothing. just test
Merge branch 'PX2' of file:///home/blissadm/mxcube into PX2
This commit includes:
   modification in MiniDiff.py to get 3click working - needs push request
   add a new local/ directory to hold gui files and local bin files
Changes concerning diffractometer motors, motors with positions and relays
Merge branch 'PX2' of file:///home/blissadm/mxcube into PX2
Version at the end of Vicente intervention November 1st 2013

At this point data collection is under development. Phi movements and
Detector (LimaAdsc) are integrated in PX2MultiCollect / SOLEILMultiCollect
This commit includes files that are part of BlissFramework or HardwareRepository submodules
that have been modified locally.  Find them in directory ToSubmit
Merge branch 'PX2' of file:///home/blissadm/mxcube into PX2
Merge pull request #2 from SOLEILPX/PX2

Px2