new login test
update user
login page included
emoticons put whitespace between string and icon
update user login
Merge remote-tracking branch 'origin/dev' into dev
update user login