Checkstyle Fixes
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #354 from mrathjen/mMaster

Checkstyle Fixes