Merge branch 'hotfix/renaming_submodule' into develop
track master
Merge branch 'release/track_master_for_mahout'