Merge pull request #393 from mhotan/phase5_development

Final Updates Fuckn ay
Merge branch 'master' of https://github.com/mhotan/DineOn into phase5_development