re-styling upload page to match others
style upload and reorder pages
Merge branch 'master' into styleUpload
Fixed problem with displaying collection multiple times
Merge branch 'master' into upload_refine
styling
Merge pull request #180 from nla/upload_refine

Upload refine
Merge pull request #181 from nla/styleUpload

Style upload
Updated views and Controllers with more accurate picture of user access based on rolesa
Added new user
Add new lu called JobStatusLu. Updated Job and Project to use the enum instead of hard coding status codes. Updated UI to handle these with better colours.
Merge pull request #183 from nla/statuses

Handle statuses better
Merge pull request #182 from nla/user_roles

User Roles update
merging lastest master changes