merge
fix image text
Merge pull request #1020 from diegosarmentero/master

fix image text
Merge branch 'master' of github.com:malderete/ninja-ide
fixing locator
Merge pull request #1024 from diegosarmentero/master

fixing locator
Issue #1018
Merge pull request #1025 from Noelkd/master

Fixed Issue #1018 
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
Update ninja_ide/gui/ide.py

Changed the way that fileData is being checked to avoid beginning error where editor refuses to start up.
Merge pull request #1046 from lowks/master

Changed the checking of fileData
Finished shortcuts manager tests, Added value method to FakeQSetting, Fixed jsonmanager tests
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
Merge branch 'shortcuts'