hamcrest, junit to web-inf/lib
Merge branch 'master' of https://github.com/Group3-ELEN7045/APS