created relations and dao's
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	data/relations.json