Fix offline test
Merge branch 'master' of git@github.com:GoliathUA/Tantrum

Conflicts:
	daemons/Daemon.php
Merge branch 'master' of git@github.com:GoliathUA/Tantrum
Merge branch 'master' of git@github.com:GoliathUA/Tantrum

Conflicts:
	cache