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