New database schema

Change-Id: I519dd41a96e50e3e91d3b95a1c680458ba7d3781
Merge branch 'master' of git@github.com:Netsensia/directorzone.git

Conflicts:
	travis/db_create.sql

Change-Id: Ieb806f4ad4dd16948f9843c764de829f882dc399