add test
Merge remote-tracking branch 'origin/master'
update web.xml 
add spring dependency
update