Sort results (timeline)
Merge branch 'master' of github.com:AnyFetch/companion-server

Conflicts:
	.gitignore