Add a login page for username and apikey
Merge branches