Help Documentation
Merge branch 'star' into www0
change email content
Merge branch 'lvzh' into www0
Merge branch 'www0' of https://github.com/EduPepperPDTesting/pepper2013-testing into star
Login page, prevent reset password if user haven't been activated
Discussion style modification
Modify registration and password resetting
Merge branch 'star' into www0