adding missing / removing unnecessary closing tags
Merge branch 'bugfix-upload-html'
Merge pull request #5 from zepheiryan/bugfix-upload-html

adding missing / removing unnecessary closing tags
Merge remote-tracking branch 'upstream/master'
UI prototype as demoed
Merge pull request #4 from wamberg/feature/queued_upload

Feature/queued upload
Connecting JSON extraction to Akara; UI is still demo-ish, does not load anything other than the test data set
Merge branch 'master' into develop
Admins can use HTML in slideshow 'custom title' field.
Merge pull request #7 from wamberg/feature/html_slide_lede

Feature/html slide lede
move from a demo to communicating with akara for JSON analysis and extraction
make file upload work - in modern browsers not including IE; making the analysis multipage instead of AJAX based would be more broadly compatible
undoing commit of akara url
Merging from feature/json-upload-ui
modify Ryan's JSON UI work to account for changes to data sources and queued data upload
add pluggable support backends, add uservoice support
remove browser field from support forms in favor of user agent
Merging from zepheiryan-feature/json-upload-ui
ensure that users in profiles list and profile pages are active
flake8 profiles app