Merge remote-tracking branch 'upstream/master'
corrected test @Autowire problem and masked failing tests
Merge pull request #73 from jateeter/master

corrected test @Autowire problem and masked failing tests