Merge branch 'master' into v2.4
delete debug code
fix alpha phpsessid bug
Merge branch 'master' into v2.4
fix year copyright