commiting before upstream merge
Merge branch 'master' of github.com:noslouch/prescott-muir

Conflicts:
	html/assets/js/build/main.js
	html/assets/js/src/main.js
updated channel images
Merge branch 'master' of github.com:noslouch/prescott-muir
updated permissions on upload directories
enabled additional reorder controls
home page working