Fixed Client message bug
Migrated messages to localization
Merge branch 'master' of local repository into OreAbstraction