joj68: remove intgration test which seem to be changing the sql alchemy session string
Set the path for files in the web setup correctly
JOJ59: Copy scientific configurations to the database
Also remove parameters if already set scientific configuration or driving data set
Merge branch 'JOJ-59'
JOJ59: Try to make radio buttons align correctly
Merge branch 'master' of github.com:NERC-CEH/jules-jasmin

Conflicts:
	majic/joj/controllers/model_run.py
	majic/joj/tests/functional/test_model_run_extents.py
Merge remote-tracking branch 'remotes/origin/master' into JOJ-25
Add group_id so we can have more than one of the same namelist
Merge branch 'master' of github.com:NERC-CEH/jules-jasmin

Conflicts:
	majic/joj/controllers/model_run.py
	majic/joj/tests/functional/test_model_run_extents.py
Add parameter to model_run to get all ParameterValues for a parameter, model_run_service added get OutputVariables, unit text fixes, f90_helper converts unicode to string
JOJ25: Add job runner code to check the status
Merge remote-tracking branch 'remotes/origin/master' into JOJ-56

Conflicts:
	majic/joj/services/model_run_service.py
Small changes to model_run_service, model_run
Small changes to model_run_service, model_run
Unit test fix (missing import statement)
Add select outputs controller and helper
Add select outputs page and controller
Add select outputs page and controller
IE8 fix
Small autocomplete scroll fix