Upload refine

Quite a few changes.

* Bump amber version. This means more properties to use and save to. Update the fact that a Work in Amber has a String BibId and not a Long.
* Also changed workflow of upload to ensure that Identify screen comes before file upload.
* Put choice of equipment into Edit screen instead of upload files screen.