merge fix
added convert.py to crontab on init.sh
fix some typos in README.md
fix merge for changes before being a direct contributor
added ajax movie upload, list of queued items on admin_root