Merge pull request #28 from baasbox/master

update from origin
Merge branch 'master' of https://github.com/giastfader/baasbox
Merge pull request #30 from baasbox/master

update from origin
Merge pull request #32 from baasbox/master

update from origin
bump to orientdb 1.7
Merge pull request #35 from baasbox/master

update from origin master
Merge branch 'master' into orientdb_1.7
Merge pull request #396 from giastfader/orientdb_1.7.x

Upgrade to Orientdb 1.7.x