Merge origin/master

Conflicts:
	partials/backoffice/booklets.html
Merge origin/master

Conflicts:
	partials/backoffice/booklets.html