Added backend implementation of subject merging.
Added controller for merging subjects
Frontend changes for merging subjects together.
Update backend test to match new exception
Oops, messed up JSONModel error handling.
Remove puts garbage
Merge pull request #487 from hudmol/merge-subjects

Merge subjects