Changed tabs to whitespaces
Merge branch 'travisci' into develop-unittests