changed all old style XML objects to JSONEntity
fixing build
added missing files
working build
Merge pull request #581 from john-hill/PLFM-2064

Plfm 2064