Merge branch 'hotfix/sensitive-attachment' into develop
Merge branch 'hotfix/94' into develop

Forward port #115
Merge branch 'hotfix/103' into develop

Forward port #103
Merge branch 'hotfix/106' into develop

Forward port #106
Merge branch 'hotfix/111' into develop

Forward port #111
Merge branch 'hotfix/release-2.2.3' into develop

2.2.3 release
Merge branch 'hotfix/116' into develop

Forward port #116
Merge branch 'hotfix/117' into develop

Forward port #117
Merge branch 'hotfix/release-2.2.4' into develop

2.2.4 release
Merge branch 'feature/118' into develop

Forward port #118
Merge branch 'hotfix/121' into develop

Forward port #121
Merge branch 'hotfix/122' into develop

Forward port #122
Fix for 119 - CSS styling for box "Important" is missing
Zend Framework 2 Advanced Course promo
Merge branch 'hotfix/training-promo'
Re-instated ZF2 advanced course banner
Merge branch 'hotfix/zf2a-course-promotion'
Added Centroy logo to homepage
Merge branch 'hotfix/new-featured-company'
Merge pull request #123 from froschdesign/hotfix/119

Fix for #119 - CSS styling for box "Important" is missing

Conflicts:
	public/css/app.min.css