email tracking prepared
Merge origin/develop into develop
Custom dimension for user percentage
Person decode
Message viewed
Notification tracking
Mail logging
Tracking in system template
Tracking controller marking messages and tracking links
DB miration
Merge origin/develop into develop
Merge origin/develop into develop

Conflicts:
	protected/views/layouts/main.php
Merge origin/develop into develop

Conflicts:
	protected/views/layouts/main.php
Mail link tracking
Merge origin/develop into develop

Conflicts:
	protected/views/layouts/main.php