fixed #83, fixed #84
fixed cpanel login
Merge branch '1.1-stable'