fixed broken admin::event_types_controller test
Merge branch 'master' into add-functionality-to-broadcast-pages