Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/view/layout/smart-admin-layout.html