account change, fix registration bugs
Merge remote-tracking branch 'origin/master'