merging
Merge branch 'master' of https://github.com/weibohe/dealaroundyou
added likes and ui changes