Changes to daas props
Merge branch 'master' of https://github.com/bbytes/DAAS

Conflicts:
	daas-rest-server/src/main/java/com/bbytes/daas/db/orientDb/OrientDbConnectionManager.java