- refactoring
- refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	curator-ui/src/main/webapp/js/listview.js