minor edits - some comments added
Removed an unused controller action
Temp commit ... Need to go to master to fix another bug
Merge branch 'master' into temp
Moved student merging code from Account -> Student

Only students need to be merged. Hence, merging code should be
student models and controllers