vchoices doesn't belong to conference
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
Remove therubyracer because of the following reasons:

* therubyracer is unstable between platforms, platform versions, ruby interpreters and even ruby versons.
  Pretty much everytime there's native extension compilation issue, it is therubyracer.
* therubyracer is officially discouraged by heroku as it uses lot of memory. On the other hand node.js advertises itself as very lightweight.
* using therubyracer on server is just like installing Node that can be used only by ruby apps (you're using v8 anyway)
* btw. node.js is necessary only on Windows and Ubuntu development, on Mac development ExecJS is using JavaScriptCore.

catched from https://github.com/sheerun/rails4-bootstrap/issues/18
Unused route for Conference#show
add volunteer fields to user
Merge pull request #310 from gopesht/unused_route

Unused route for Conference#show
remove put method
style fixes
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