Integration tests
Merge branch 'develop' of ssh://git@github.com/alcengapa/TDAF.git into
develop