Add Mina configuration
Rollback routes OPTIONS change [ci skip]
Merge pull request #295 from openSUSE/review_140704_deploy_with_mina

Add Mina configuration
Merge pull request #275 from hennevogel/master

vchoices doesn't belong to conference
Implements OPTIONS http verb for root path
close #294
Merge pull request #296 from ChrisBr/implements_options_for_root

Implements OPTIONS http verb for root path
Removed conference_date_string_helper, moved date_string to application_controller

Deleted home_helper.rb
Merge pull request #303 from gopesht/modify_date_helper

Removed conference_date_string_helper, moved date_string helper to application_controller
Unused route for Conference#show
add volunteer fields to user
Merge pull request #310 from gopesht/unused_route

Unused route for Conference#show
fix attachment_default migration
Merge pull request #314 from differentreality/attachment_default

fix attachment_default migration
Merge pull request #312 from differentreality/user_fields_volunteers

Add volunteer fields to user
Adds email template and settings for conference dates updates
Conference date update email notification completed

Added tests
Adds migration for Conference Registration Dates to Email Settings
Adds email template and settings for conference registration dates updates

Added tests

Minor typo
Added test for email notification on conference dates and registration dates updates
Merge pull request #298 from gopesht/notify_on_date_change

Notify on date change