stashing to merge
Merge branch 'master' of https://github.com/joubin/CSC191

merging conflicts
Fixed pom.xml merge conflict. Moved facebookid for oath authentication to system.properties. Added dev/production app mode switch in system.properties to override debug header logic. Added documentation to comments in the controller.