fix controller path
changed DB
changed require
changed include
changed require
changed include
changed include
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	model/metadata/Task.class.php