api and app work
api and app work
api and app work
api work
Merge origin/master

Conflicts:
	api.php
	api/domain/task/daemon.php
	api/error/controller.php