Drag & Drop on Analyze portlet.
Getting the right file format on analyze portlet
Merge remote-tracking branch 'origin/local_store' into local_store

Conflicts:
	docroot/WEB-INF/src/edu/jhu/cvrg/waveform/backing/AnalyzeBacking.java
	docroot/css/main.css
	docroot/js/main.js
	docroot/views/view.xhtml