Back to where I was now in Struts 2.0
Double sync
syncodemio
Merge branch 'master' of https://github.com/cisbjmaclean/CIS2232_Intercession20132014

Conflicts:
	Mike/StorageUnits2.0/nbproject/private/private.properties