Merge branch 'master' into TG20
Added logging messages
edited
removed cookie from return value
Merge branch 'TG20' of github.com:InCNTRE/oftest into TG20