Library browser 1, OPL-update bug fixes and small feature improvements.
Restoring watermark javascript function
Reverting some changes which got carried here from develop branch.
Merge pull request #211 from jwj61/rel28

Rel28