Merge pull request #1 from Druotic/jjbeaver_crud_tree_display

Changed `list` to `index` and update (hopefully) all references and use ...
Fix associating an assignment with a course from the assignment.
Merge github.com:expertiza/expertiza into rails4

Update from upstream