BUG fixed: block element not reset if norm=0
Adds labels for ibug eye annotations
Merge pull request #382 from dubzzz/hog_bug

BUG fixed: block element not reset if norm=0
Merge pull request #386 from jalabort/eye_labels

Adds labels for the ibug eye annotation scheme
Merge remote-tracking branch 'upstream/master' into mmb