Newsletters
Newsletters
Add annotations to newsletters
Merge branch 'shop' into subscriptions
Finish newsletters
Merge branch 'shop' into subscriptions

Conflicts:
	assets/views/admin/common/header.php
	classes/App/Admin/CRUDController.php
	classes/App/Admin/Controller.php