reapplied formatting standard to DEVELOPMENT branch, issue #34
readded check for resolving sourceserver to DEVELOPMENT branch, not sure why it was removed, maybe not properly syncing dev to working branch?