Fetched changes and additions from the origin 11/04/2013
My local changes to Organization code 12/04/2013
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	MMS_Project_DatabaseClasses/nbproject/genfiles.properties
	MMS_Project_DatabaseClasses/nbproject/private/private.properties
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
stuff
Removed MMS_Project_DatabaseClasses