Merge branch 'master' of https://github.com/ninja-ide/ninja-ide
merge
Merge branch 'master' of https://github.com/ninja-ide/ninja-ide

Conflicts:
	ninja_ide/__init__.py
	ninja_ide/core/core.py
	ninja_ide/core/file_manager.py
	ninja_ide/core/filesystem_notifications/base_watcher.py
	ninja_ide/core/filesystem_notifications/linux.py
	ninja_ide/core/filesystem_notifications/windows.py
	ninja_ide/gui/actions.py
	ninja_ide/gui/editor/migration_2to3.py