Fixed relative url issues for SPOT-1403
Reverse url lookups for SPOT-1403.
Merge remote-tracking branch 'origin/spidertrapfix'

Conflicts:
	templates/base-desktop.html