other things
Merge branch 'master' of https://github.com/ViditTiwari/DBMS

Conflicts:
	core/functions/users.php