fix error in admin navigation controller when trying to flush buffer when there was no buffer
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/master
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/master
Updated version numbers
Fixed a version typo in the readme
issue #3084 solved, bug cannot use a stdObject as an array
Updated to use proper affiliate link for MaxCDN.
MaxCDN constant fix.
Fixes #3276: Automatically sets encryption keys for on install so users don't need to
FIX: Added in required PHP constant value 'CDN_OFFER_URL' which was missing from the installer config causing the installation to complete but display a notice on environments where error reporting is enabled.
FIX: Added check to see if an admin user is attempting to search via ajax in the control panel.
Merge pull request #3282 from phillipdaviesdeveloper/2.2/feature/admin_search_non_admin_fix

FIX: Added check to see if an admin user is attempting to search via ajax
Fixes #3278
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/master' of git://github.com/pyrocms/pyrocms into release/2.2.4
Updated version numbers and release dates.
Merge branch 'release/2.2.4' into 2.2/develop
Tests 2/3 success for 2.2/develop
Merge branch '2.2/feature/Installer_fix' of https://github.com/phillipdaviesdeveloper/pyrocms into 2.2/develop

Conflicts:
	installer/config/constants.php
Add travis vhost setup.