fixing dependency problem
Merge branch 'master' of github.com:miho/JavaOne-2014