Merge pull request #1 from orclev/master

Bug fix for reflected line
Various bugfixes since UI 2.0
Removed filter for Relic Hunters which was accidentally commited
Merge pull request #1 from James226/master

Merging in upstream changes