Kracoeus 7002

This pull request includes rebasing against master right now. If you rebase and update your own branch you should be able to more easily compare the changes. Or you can simply look at the most recent commit in this history. It includes JPA changes that will allow the proposal to be persisted, even on initial save with Proposal site and congressional districts. Let me know if you have any questions about it or any further problems with it.