entity conf 1st draft
mostly done, lets merge from develop
Merge branch 'develop' into config

Conflicts:
	app/main/db.py
Merge branch 'develop' into config
added missing characters to code