Fixed shift entry form

The fields / field values did not match the labels in the form shift entry creation form.
Also the shift duration is now caluculated correctly (therefore this pull request includes pr #157, sorry)