MAP_DOTS_PER_INCH, closes #736
Merge branch '13.09' into 14.01

Conflicts:
	analytics/src/main/webapp/js/lib/external/ext
	config/configurations/template
Merge branch '14.01' into 14.06

Conflicts:
	config/configurations/template