cleaning
Merge branch 'Version-2' of https://github.com/TER-2013-2014-estimation-prj/TER.git into Version-2