updates merged from SteakCMS
Cookie bug fix
Router bug fix
Session error handling