Use a cross platform compatible mechanism for hacking the entity class name down
Replace DisplayGrid view helper with the correct file, rather than a copy of the JqGridFactory file/class
Merge branch 'fixes'