Merge remote-tracking branch 'origin/sqlite-fixes' into develop
Merge remote-tracking branch 'origin/file-upload-plugins' into develop
better fix for site_root autodetection - seemingly SCRIPT_URI is not always present
Merge remote-tracking branch 'origin/file-upload-plugins' into develop
Merge remote-tracking branch 'origin/sqlite-fixes' into develop

Conflicts:
	website_code/php/database_library_sqlite.php
fix merge issue
move develop to include the pdo branch
merge fix
see issue #64 - jquery ui renamed resize to refresh for some reason - this change fixes the tabbed navigation pages
fix sql query / parameter embedding - list_folders_in_this_folder(); breaks front page
Merge pull request #71 from palepurple/issue-64

solves issue with tab navigation not working ( Issue 64 )
Merge pull request #72 from palepurple/mysql-display-library-fix

Mysql display library fix
Merge remote-tracking branch 'origin/develop' into editor