Merge branch 'master' of https://github.com/Leongum/WalkFun_IOS

Conflicts:
RevolUtioN/Items/ItemMallViewController.m
RevolUtioN/Items/ItemsMainViewController.m
WalkFun.xcodeproj/project.pbxproj
conflict