Merge branch 'develop' of https://github.com/McLucas/ddf-admin into feature/DIB-1769
DDF-682
updating backend to account for mark's changes.
Merge branch 'feature/DIB-1769' into feature/DDF-670-with-jerens
DDF-682
UUID treated as strings now so they can be utilized by the backbone.
integrated the javascriptLocation in jeren's new changes with the new ui tabs.
Merge branch 'feature/DIB-1769' into feature/DDF-670-with-jerens