Merge pull request #32 from lararennie/label_fixes

Removing unnecessary two-step assignation of mores in ClientData.java