Fixed imports in source files
Merge branch 'master' of github.com:Archimidis/jsp-training