Merge branch 'master' of http://github.com/TEAMMATES/repo
Merge branch 'master' of https://github.com/TEAMMATES/repo
added a condition to avoid boundary condition error
one more boundary condition edit that was missed from last time
Merge branch 'master' of https://github.com/TEAMMATES/repo into Issue1847
Added a batch file to run tests outside eclipse
Merge branch 'master' into Issue1847
[1847] Clean up InstructorFeedbackDeleteAction

fixes #1847
Merge branch 'master' of https://github.com/TEAMMATES/repo