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
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
[Bugfix] Admin event states controller
#286
fix #287
[Bugfix] Implements check if mail templates not nil
fix #286
[Bugfix] Added missing namespace for TransitionsException
Implements default mail templates.
close #16