removing .sass-cache file from local
Schiller data upload functionality added
UploadManager changes
syncing workspace with latest commits
?
Added file encoding check for XML input streams
Added a log message for character encoding and modified the
SniffedXmlInputStream to default to UTF-16
Reverted back to original code as the new checks were causing other file
formats to break.  The new InputStream class is still present for now,
but has been marked Deprecated.
Agilefant issue #235 - Background queue refresh in Firefox
Made upload use the Apache XmlStreamReader class for string decoding
Cleaned up code and rolled back changes
Merge remote-tracking branch 'origin/local_store' into componentized

Conflicts:
	docroot/WEB-INF/src/edu/jhu/cvrg/waveform/main/UploadManager.java
	docroot/js/main.js