fix users json
fix users and login page
minor tweaks
add dialer users
Merge branch 'dialer'

Conflicts:
	users.json