MERGED: merged origin/liang to master
ADDED: integration with group 1 for user authentication
Merge remote-tracking branch 'origin/liang'