using singular for services
merge master
merging upstream
Merge branch '1310' into singular-services
converted the rest of the services to singular
they never end
fixing some bugs
Merge branch '1310' into singular-services
Merge branch '1310' into singular-services
white space