Fixed #998, merge
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
merge
Merge
Merge branch 'master' of github.com:malderete/ninja-ide
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
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'
Added default_val=None in valu() inside FakeQSettings
Fixed issue #1052 problem with the interaction between misc and plugins
Merge pull request #999 from malderete/master

Fixed #998