Merge pull request #10 from mszymczak-neducatio/master

Added optional java environment.
moved provisioning to separate directory
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into spring