changed branding
Merge branch 'gh-pages' of github.com:frc/Frantic-S3-Browser into gh-pages
fixed conflict
neutral branding
Configurable S3 endpoint to avoid 307 Temporary Redirects causing problems with Google Chrome's XMLHttpRequest handling.
Merge branch 'master' into Frantic

Conflicts:
	assets/css/branding.css
	assets/css/frantics3browser.css