Minor changes.
Merge remote-tracking branch 'lrsjng/develop' into develop

Conflicts:
	src/_h5ai/client/js/lib/jquery.filedrop-0.1.0.js