Merge remote-tracking branch 'upstream/master'
Rest configurator
Added logging configuration for junit
Switched heatmap and analysis panels. fixes #465
Resized analysis panel to 25%.
Resized radial tree to proper width requirements.
Added dynamic sizing of heatmap panels. Needs update when screen width is adjusted. fixes #466. fixes #467.
Merged tabs for current and uploads. fixes #463.
bugfix: trim spaces from selection set name before saving
Merge pull request #468 from apartensky/master

bugfix: trim spaces from selection set name before saving
Added single button uploads. fixes #464.
Merge pull request #469 from jfarid27/fix-issue-465

Changes for Yaoyu's updates
Merge pull request #470 from dfci-cccb/development

Merging Development
wip: added /templates/ mapping to ViewController that supports files in subfolders
wip: added RequestToViewName bean to support views in subfolders
wip: (compile fix)  added RequestToViewName bean to support views in subfolders
move selection set manager into it's own directive
move selection set manager into it's own directive (forgot to commit selectionSetManager.ftl)
Move SetManager directive to its own js file
wip: SetManager directive with own contrller and isolated scope