Changed the params for running on serapis dev
Small fixes and adjustments
Small bug fixes
Insignif changes
Small changes
Small adjustments, plus merge
Second part of small fixes
Small adjustments
Fixed conflicts
Merge branch 'master' of github.com:wtsi-hgi/serapis-web
Small bug fixes
Conflict resolution and small bug fix
Merge branch 'master' of github.com:wtsi-hgi/serapis-web
Merge branch 'master' of github.com:wtsi-hgi/serapis-web
Merge branch 'master' of github.com:wtsi-hgi/serapis-web
Bug fixes
Conflict fixed
Bug fixes and conflict resolution
Conflict solving
Merge branch 'master' of github.com:wtsi-hgi/serapis-web