Develop tmp2 --minor fixes

Changed VERSION
Changed file paths for LibraryBrowser3 files to account for introduction of bower_components directory
Fixed overlooked  <<< conflict marks in ProjectGrader.pm
LB3 still has not been changed to account for the behavior in "options" in Backbone.  This may be unnecessary if the library component of Homework Manager handles a superset of use cases of LB3.