scala project update
Merge branch 'master' of github.com:bespalovdn/projects