Merge branch 'master' into feature/69-fund-page

fabfile.py

opentech/apply/dashboard/__init__.py

opentech/apply/dashboard/apps.py

opentech/apply/dashboard/migrations/__init__.py

opentech/apply/dashboard/models.py

opentech/apply/dashboard/tables.py

opentech/apply/dashboard/templates/dashboard/dashboard.html

...ech/apply/dashboard/templates/dashboard/tables/table.html

opentech/apply/dashboard/urls.py

opentech/apply/dashboard/views.py

opentech/apply/funds/admin.py

opentech/apply/funds/blocks.py

...tech/apply/funds/migrations/0005_applicationsubmission.py

...h/apply/funds/migrations/0006_update_block_definitions.py

opentech/apply/funds/migrations/0007_round.py

opentech/apply/funds/migrations/0008_add_date_to_round.py

opentech/apply/funds/migrations/0009_update_date_fields.py

...apply/funds/migrations/0010_update_for_rich_text_block.py

...migrations/0011_update_encoder_add_round_to_submission.py

opentech/apply/funds/models.py