Merge branch 'master' of https://github.com/AustralianSynchrotron/pdviper

Conflicts:
	docs/installation.rst
Changed to us qt4 instead of WX widget set

added ability to read bruker RAW data format (beta)