Merge branch 'master' into feature/news_priorities
First pass at capturing news priority
Merge branch 'master' into feature/news_priorities
Fix for revert and verify when adding pref_newspriority
Work on the new national campaign theme
Server-side form validation for /preferences
National theme modifications
Fix merge conflict
Update submodule
Merge branch 'feature/theme_national' into develop
Re-fix the merge conflict; change wording for subscription preference
Merge branch 'feature/news_priorities' into develop
Merge in theme and new priorities and update copy
Bump version numbers; update submodule
Merge branch 'release/v0.3.0' into develop