Set correct base path.
Adding search button to marketplace search; fixing add-on sets not showing up properly in search; making filter by set work
Fix force upgrade not working.
PSR2 for inspect controller; fixing Undefined class constant 'FILENAME_PAGE_TEMPLATE_DEFAULT_ICON'
renaming some page template files for better standards
Fixing random unavailable attribute key
Merge pull request #1382 from Mnkras/hotfix/fix-js-assets

Fix js assets not having the correct path
Merge branch 'develop' of github.com:concrete5/concrete5-5.7.0 into develop
fixed social links form.js problem when minified
Merge pull request #1388 from mlabrum/bug/force-upgrade-doesnt-work

Fix force upgrade not working.
Merge branch 'develop' of github.com:concrete5/concrete5-5.7.0 into develop
Fix filemanager file upload