Trying to fix upload progressbar
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/model/GenomizerModel.java
Trying to fix upload progressbar