[01092014] - Thien commit fix some bug
Merge branch 'master' into bs135
BS 140902 implement forgot password