Fixed issue #1108 and #1112
Merge pull request #1110 from diguito69/master

Fixed issue #1108 and #1112
Removed unused IS_LINUX and IS_MAC flags from settings.py
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
Merge with ninja-ide master