conflict version
pull from master
fix the conflict
31/03/14 finish user register part