Merge pull request #206 from davidmsantos90/master

[CDE-406]: Drag and drop / reorder doesn't work for teh freeform layout
Merge pull request #207 from davidmsantos90/master

[CDE-406]: fixed javascript unit tests