Update UserProperty and Handle the confict.
Merge pull request #15 from Jimmytanuwijaya/master

Update UserProperty and Handle the confict.