Simplified conference and event controllers. Moved url_shortener to events controller
Merge remote-tracking branch 'upstream/develop' into develop
Added missing locale