10.14 4.0
10.14 5.0

Conflicts:
	js/view/toolCompare.js