Edited classes to reflect minor changes in database structure.
Explicitly defined 1.7 as the version of Java to compile JSP with.