Update to include Denison changes for grunt and application files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbpalace-ui/src/main/webapp/javascript/dist/dbpalace-min.js
Deleting generated files