Update properties
Merge branch 'master' of https://github.com/xiiinyiii/myHangOut