add quiz names to filter still NOT WORKING
Merge branch 'develop' of https://github.com/LemoProject/Lemo-Application-Server into develop
resolve merge conflicts