border bug fix
2.5.2
Merge branch 'dev'

Conflicts:
	resources/js/screenshot.js
	resources/js/screenshot.min.js
	resources/js/theme/theme.min.js