BZ-0000 improved markups
Merge remote-tracking branch 'refs/remotes/origin/noesispro_fd' into noesispro_fd

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