removed @ActiveProfiles
Merge branch 'master' of github.com:lrozek/spring-boot-1109