merge dev
Merge branch 'master' of github.com:markkerzner/HadoopIlluminated
Merge branch 'master' into dev