Minor changes
Added term expiry date to fleet profile
Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	.gitignore
	assets/css/digital/main.css
	assets/css/digital/main.min.css
GIT HELL