awesomely added login, userlist
merged v1.0 and dev