fixed scopes
Merge branch 'master' of github.com:ivargrimstad/spring-javaee