Merge pull request #70 from 54wang17/master

12/4/2014 Master - 17master
Merge pull request #71 from danuzclaudes/master

12/4/2014 Development - Master
Merge pull request #72 from 54wang17/master

12/4/2014 Master - 17master
Merge pull request #73 from danuzclaudes/master

12/4/2014 Development - Master
Merge pull request #74 from 54wang17/master

12/4/2014 Online - Master
Merge pull request #75 from 54wang17/master

12/4/2014 Master
Merge branch 'master' of https://github.com/danuzclaudes/HeelFoodie into development
Merge pull request #76 from 54wang17/master

Online
Capital Revised
Merge pull request #77 from danuzclaudes/development

12/4/2014 Development - Master
Merge pull request #15 from 54wang17/master

Master
Merge pull request #18 from danuzclaudes/master

2 files changed
Merge pull request #19 from 54wang17/chongrui

Chongrui