Change branch, submit current work

fning
Now can enter final estimate.

fning
Change validator. Button will be disabled if the number in text field is the same as the final estimate.

fning
fixes merge conflicts and formats files
Merge pull request #211 from alexbragdon/feature/Iteration-6-dev-enter-final-estimate

Now moderator can enter final estimate.