BZ-11757 - huge refactoring, removed redundant neFileDownload directive.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/js/bootstrap.deps.js