Users stuff
Merge branch 'service-api' of github.com:thomastuts/artedex-service into service-api

Conflicts:
	api/modules/users.php
Merge branch 'service-api'