filter js and dao
Merge branch 'master' of https://github.com/JuSKT/LO54_Project_WebService.git