Replaced Service.java with SystemServices.java, added /client/test GET
request
Merge remote-tracking branch 'origin/master'