Merge branch 'dev'
Merge pull request #781 from echel0n/dev

Dev
Fixed saving general settings rootDir error
Merge branch 'dev'
Merge pull request #794 from echel0n/dev

Dev
Update .travis.yml, fix imports and tests
Merge pull request #795 from adam111316/travis

Update .travis.yml, fix imports and tests
Merge remote-tracking branch 'upstream/dev' into dev