Server: cleanup SDCCLient: organize requires, use when.promise instead of deferred.
Server: cleanup SDCCLient: organize requires, use when.promise instead of deferred.

Faithlife/sdc-portal,Faithlife/sdc-portal,Faithlife/sdc-portal