Moving back to ancient MVC approach (database handling change)
Broken: JSON management
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.py