Merge branch 'development' into fix-639/shovill-asm

# Conflicts:
#	src/main/java/ca/corefacility/bioinformatics/irida/ria/web/analysis/AnalysisController.java
#	src/test/java/ca/corefacility/bioinformatics/irida/ria/unit/web/analysis/AnalysisControllerTest.java
5 jobs for fix-639/shovill-asm in 108 minutes and 40 seconds (queued for 54 minutes and 39 seconds)
latest
Status Job ID Name Coverage
  Test
passed #33368
docker
build-docs_job

00:02:16

passed #33367
docker
galaxy_job

01:01:07

passed #33366
docker
rest_job

00:11:30

passed #33364
docker
service_job

00:11:22

passed #33365
docker
ui_job

00:29:21