Changed adhoc_setup for iris
Merge branch 'iris' of github.com:Kurocon/IntegrationProject into iris
Fixed adhoc_setup
Fixed adhoc_setup for iris
Removed extra bracket from script.
Merge conflicts