separate java to a file
Merge branch 'es' of github.com:hvnsweeting/saltstates into es