Merge pull request #21 from baasbox/master

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

update from origin
Fixed some erratic error on test related to the override settings feature
Fixed some erratic error on test related to the override settings feature
implemented export/import usign root access
fixed export/import routes for root user
Test for export db by root user
Test for import db by root user
Merge pull request #316 from giastfader/master

fixed #315 - root user can perform db export/import
Merge pull request #63 from baasbox/master

pull request from repository master