add allow origin header
Merge remote-tracking branch 'origin/master' into dev
Merge branch 'master' into dev
added task route
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	model/metadata/Task.class.php