Adding error trap account cookie and cgi scan
Merge branch 'develop'