added default token for safeUrl service
removes session namespace options
Merge branch 'master' of https://github.com/twinh/wei