Add comments for filter method on Tag to keep PhpStorm happy.
Add: DELETE /api/device with form param api_key. It checks for existence of API key, else returns 404.
Fix conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app.php
	src/bootstrap.php

Fixed conflicts.