Quick update
Merge branch 'master' of udit80.iaa.es:/home/jmiguel/DEVELOP/papi

Conflicts:
	reduce/calDomeFlat.py
	reduce/calSuperFlat.py
	reduce/calTwFlat.py
	reduce/reductionset.py
Bugfix and improvements to applyDarkFlat.py
An update for sync.
Adding BPM_3 to panic2
Merge branch 'master' of udit80.iaa.es:/home/jmiguel/DEVELOP/papi

Conflicts:
	misc/health.py
	reduce/applyDarkFlat.py
	reduce/calSuperFlat.py
Merge branch 'master' into limpia