Added a test file
Added JUnit dependency
added shop..
Merge branch 'work' into facelets