Merge pull request #901 from VinRudramurthy/dev-branch

Added spaces for colon.
Removed MP.java file and added I18N support for missing files.