Merge pull request #230 from GeertJohan/master

Cleanup & refactoring
Merge pull request #231 from GeertJohan/master

Fix assignment errors after method check refactoring
Merge pull request #232 from GeertJohan/master

Always enable scrollbar
Merge pull request #233 from GeertJohan/master

Fix pagination styling
Merge pull request #234 from GeertJohan/master

New annotation wiz
Changes to get GJ's highlight-coordinates correctly into the database.
Fixed something that should not have changed.
Made the highlights visible on the page, in the correct color.
Merge pull request #1 from gwitmond/highlight

Show highlights on the document page
Merge pull request #235 from gwitmond/master

Show highlights on the document page
Merge pull request #239 from GeertJohan/master

Upgrade go.rice
Merge pull request #240 from GeertJohan/master

Upgrade go-flags
Filter annotations to the current page.
Moved the add-annotation button to the top of the annotations.
Normalise coordinatas so the X1,Y1 is top left, irrespective of how the user selected it.
Merge pull request #2 from gwitmond/highlight

Filter annotations to the current page.
Merge branch 'master' of github.com:nulpunt/nulpunt into highlight
Merge pull request #241 from gwitmond/master

Filter annotations to the current page
Sorting tags alphabetically.
Fixing partially refactored getDocumentList call.
Merge branch 'master' of github.com:nulpunt/nulpunt
Merge pull request #242 from gwitmond/highlight

Sorting tags alphabetically
Brown paper bag bug with missing comma.
OOPS.