- Users cleanup
- Add login for merchant.html
- Add /users/getCurrentUser method to UsersController