Merge branch 'olupton-TisTosParticleTagger' into '2016-patches'

Allow L0/Hlt1/Hlt2 tools used by TisTosParticleTagger to have different TOS fractions

See merge request !177 (merged)