jquery
Merge branch 'master' of https://github.com/mok89/UEM.git
Added res folder and modify the file servlet-context.xml