fixed add and edit student functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/implementation/controller/spreadsheet/SpreadsheetController.java
fixed add and edit student functionality