Added w20/50 calculation to parametriser
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD
Removed indentation of XML output file to reduce file size.
Fixed git conflict in store_xml.py
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD
Calculate correct number of pixels in mask optimisation
Remove calculation of integrated flux from parametrisation module
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD
Raise catalogue window on every request.
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD
Enabled output parameter selection in GUI and ellipse fitting in parametrisation module.
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD

Conflicts:
	gui/SoFiA.cpp
Resolved conflict in SoFiA.cpp.
Introduced measurement of Wm50 (Courtois et al. 2009) in parametrisation module.
Merge branch 'master' of https://github.com/SoFiA-Admin/SoFiA into HEAD