add ErlideServiceLocator class
code cleanup
hotfixes
remove printouts in debugger
merge master hotfixes