Reverted change to getCurrentUrl function
Merge branch 'themes' of github.com:FelixOnline/FelixOnline into themes