add text: query
Merge from Server

Merge branch 'master' of https://github.com/stunplugged/DBFlyveklubben
update ER desc.
Merge from server
Merge branch 'master' of https://github.com/stunplugged/DBFlyveklubben