test merge to preMaster
+ add simple changes to use Spring
Merge pull request #1 from gnedov/Andr

test merge to preMaster