Merge remote-tracking branches 'origin/master' and 'upstream/master'
SIMS-885 SIMS-931 most of the groundwork set up for these 2 tickets
SIMS-931 got backbone-search to work with backbone-pageable
SIMS-926 added GRCoordinator role which only adds the permission to view edit pencils on the staff page. All other perms must be inherited from another group assignment
SIMS-931 search is complete
SIMS-885 bulk add features added
saving stuff for later
SIMS-950
Resolving conflict on LoginView.js
Fixing merge conflict
removing console.log
SIMS-950 search filter function implemented on learn page
Fixed search box reset function
Merge branch 'LearnFilters'
Merge branch 'master' of github.com:editure/ReadyLab
setting up navigation controls in offline mode
Merge remote-tracking branches 'origin/master' and 'upstream/master'
merge
Merge branch 'master' of github.com:editure/ReadyLab
Merge remote-tracking branches 'origin/master' and 'upstream/master'
Merge pull request #312 from theD1360/master

Staff Page and Edit page changes