Merge branch 'merge_0.9.x' into gwas

Conflicts:
	web-app/js/cbrowser.js
	web-app/js/domui.js
	web-app/js/feature-draw.js
	web-app/js/version.js