193 admin can retire filling

closes #193 

Did a lot of changes leading up to allowing an admin to edit a filling.

There are a ton of commits because I was fetching and rebasing as PR's were merged with master. I wanted to
see what would happen. It just causes some conflicts you have to constantly fix apparently.