Merge branch 'bugfix-upload-html'
Merge remote-tracking branch 'upstream/master'
UI prototype as demoed
Connecting JSON extraction to Akara; UI is still demo-ish, does not load anything other than the test data set
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
Merging from zepheiryan-feature/json-upload-ui