etl

0b423514 - Merge remote-tracking branch 'origin/development'

Merge remote-tracking branch 'origin/development' # Conflicts: # src/factory.h # test/codeblocks/ETL.depend # test/codeblocks/ETL.layout # test/test_factory.cpp