Update readme.md to make a note of the transcoding (flv->mp4).
Merge remote-tracking branch 'upstream/develop' into sqlite-fixes
improve site root detection - [SCRIPT_URI] is not always present so use HTTP_HOST and REQUEST_URI
Merge remote-tracking branch 'upstream/develop' into file-upload-plugins
Merge remote-tracking branch 'origin/file-upload-plugins' into file-upload-plugins
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