ETL-controller

Also proper updates to ETL.hrl
Merge branch 'master' of https://github.com/MercuryGroup/BISystem