Change 'trademarks' to 'marks'
Merge pull request #787 from theodi/feature-branding-guidelines

Add branding guidelines
Added a full stop.
Merge pull request #789 from theodi/feature-add-full-stop

Added a full stop.
Don't choke on blank rows
Merge pull request #790 from theodi/bugfix-stop-choking-on-blank-rows

Don't choke on blank rows
Change expiry warning wording
Merge pull request #792 from theodi/bugfix-change-warning-wording

Change expiry warning wording
Add method to see if user has any expiring or expired certificates
Add warning message if user has expiring or expired certificates
Change aasm_state to state

This allows a expired, or expiring state to be set
Get days to expiry for expiring certificates
Add translations
Add status badges for expiring or expired certificates
Add expiry date to notice

Fixes https://github.com/theodi/shared/issues/247
NESTING STUFF IN THE H1 MAKES EVERYTHING A BIT SHOUTY
Merge pull request #793 from theodi/feature-show-expiring-status-on-list

Show certificate's expiring status on 'My Certificates' page
Only class published certificates as expired or expiring
Merge pull request #794 from theodi/bugfix-dont-class-draft-certficates-as-expired

Only class published certificates as expired or expiring
Merge branch 'refs/heads/master' into staging