Moves conference show #action to #edit action
Merge pull request #154 from ChrisBr/new_admin_rb

Moves conference show #action to #edit action