Minor cleanup
Moved upload/download test classes into test
Moved pmu-java-ui to pmu-desktop-ui
Merge branch 'master' of https://github.com/GridOPTICS/GOSS-Tutorial

Conflicts:
	pom.xml