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