Fixed financial_table.jsp null pointer exception.
Trying to fix the merge.
Merge branch 'master' of https://github.com/kent-ma/ece356

Conflicts:
	nbproject/genfiles.properties
	nbproject/project.properties