Merged files as of midday.
Sync and Merge.
Merge.

Conflicts Resolved in:
	gtpb_clientside/WEB-INF/templates/gui/development/update_calculation.vm
	gtpb_clientside/website/agilebase.jsp
	gtpb_server/src/com/gtwm/pb/model/manageSchema/ReportCalcFieldDefn.java
Merge pull request #44 from g1smd/master

Manually re-added your changes.