Merge pull request #260 from mhotan/phase_4_dev

Refactoring and Bug fixes
Put Create Account, Forgot Password buttons on the login page
Merge pull request #261 from glee23/master

Put Create Account, Forgot Password buttons on login page
Merge branch 'master' of https://github.com/blasv/DineOn into phase_4_dev