Sorry. Upload now working. Groups display accordingly
Merge branch 'master' of https://github.com/rhamache/teamfok

Conflicts:
	src/upload/UploadController.java