DEV-17606
DEV-17606
Merge branch 'master' of https://github.com/Unact/Renew

Conflicts:
	public/javascripts/app/view/Lib/Grid/Panel.js