Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev
make the avatar image max size to 2MB
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
remove the test warning div