Fixed Issue #13,Issue #11
Merge branch 'master' of https://github.com/orientechnologies/orientdb-studio