Added backend implementation of subject merging.
Added controller for merging subjects
WIP add v2.3.2 of twitter bootstrap to the frontend
WIP Merge aspace twitter js overrides with 2.3.2;
50810967 fix +1 not working for records (outside of the tree context)
Frontend changes for merging subjects together.
Update backend test to match new exception
Fix asset-path/url issues with new version of less-rails; Introduce 2.3.2 twitter bootstrap to the public app;
Oops, messed up JSONModel error handling.
Remove puts garbage
Merge pull request #487 from hudmol/merge-subjects

Merge subjects
WIP add publish to agents and only show published agents in the public app
Add a test to check published agents in the public app
Merge pull request #488 from hudmol/some-ui-bug-fixes

[Delivers #50810967] fix +1 not working for records (outside of the tree context)
Merge pull request #489 from hudmol/upgrade-twitter-boostrap-2.3.2

Upgrade to Twitter Bootstrap 2.3.2
Merge pull request #491 from hudmol/50619651-filter-user-agents

[Delivers #50619651] filter agent created for users from public
Rework relationships to allow us to get the name of the relationships when querying dependencies.
Lift definition of 'assimilate' into the relationship module and test that it applies correctly to agents.
Add unit test to verify that related agents are handled properly when merging two agents
Add endpoints for merging agents