BS 140831 fix display teacher avatar
Merge branch 'master' into bs135
BS 140902 implement forgot password
BS 140902 edit invite email template
[03092014] - Thien finish merge bs135