Corrected settings on file tree view
Update build.xml
Update build.xml
Update build.xml
Delete main.css
Delete EnumFileType.java
Delete MetaContainer.java
Delete UploadQueryBuilder.java
Delete UploadUtility.java
Update UploadManager.java
Update FileUploadBacking.java
Update view.xhtml
Integration with FileStore 2.0
Merge remote-tracking branch 'origin/Waveform3_5' into componentized

Conflicts:
	docroot/WEB-INF/src/edu/jhu/cvrg/waveform/backing/FileUploadBacking.java
	docroot/WEB-INF/src/edu/jhu/cvrg/waveform/main/UploadManager.java
	docroot/views/view.xhtml