Removed .iml files
Removed redundant idea files
Updated .gitignore
Changed assembly plugin version
Removed ml.jar building form package phase
Merged 'master' branch into 'maven'