Scripts: Changed ordering of commands in wait loop when too many jobs are sent to blaster
Calib: Move fConvergenceFactor to base class TCCalib
Calib: Disentangle libCaLib from acqu_user libs
Calib: Addding fConvergenceFactor to energy gain calibration
User: Calib: Use photon energies directly, not the mean (variable names not changed though)
Calib: Use squared ratio of pi0 masses for energy calibration, according to Dominik's PhD thesis
Calib: Linear ratios converge better for uncalibrated gains

This reverts commit 3c3bdc2d5ecaf47bbbee8bd1796730277c5eb677.
Calib: Minor documentation fix
User: Calib: Quadratic energy correction might be broken anyhow, so use mean of photon energies

This reverts commit 1646cdcea36a5cadd03be3bb61c4db0ce9af8148.
Core: Make HitCluster_t remember energies

Conflicts:
	acqu_core/AcquRoot/src/HitCluster_t.cc
Core: Add hackish code to display energies per cluster (disabled by default)
User: Remove UCLA/Sergeys clustering algorithm
User: Remove TAPS-specific clustering
User: Get rid of Max-TAPSCluster config, should always be Max-Cluster
Core: Remove TA2TOFApparatus, including unused base classes
Core: Fixed code indentation
Core: Refactor: De-inline TA2ClusterDetector/HitCluster_t methods
Scripts: Add some Next-Neighbour: perl helper scripts
Scripts: Remove intermediate helper scripts again
Core: New clustering algorithm

The details are described in the DAQ Wiki here:
http://wwwa2.kph.uni-mainz.de/intern/daqwiki/analysis/clustering