Latest version as of Friday, July 26, 2013
Can now upload Muse and Philips 1.04 file formats.  Note:  The GE Muse
format still does not display correct ECG data.
Merge branch 'Muse_and_Philips104-' of
https://github.com/CardioVascular-Research-Group/upload-portlet.git into
Muse_and_Philips104-

Conflicts:
	docroot/WEB-INF/src/edu/jhu/cvrg/waveform/main/UploadManager.java
Re-commiting this file
Cleaned up code
Fixed issues with checking for all three XML file types