Merge branch 'hotfix/Test'
Merge branch 'develop'
Add test settings
Merge branch 'hotfix/travis' into develop