Merge origin/master

Conflicts:
	users.dat
Merge origin/master
Merge origin/master

Conflicts:
	users.dat