Merge branch 'hotfix/release-2.2.3'

2.2.3 release
update conferences
include location
Merge branch 'hotfix/participate-conferences' of https://github.com/basz/zf-web into hotfix/participate-conferences

# Via Matthew Weier O'Phinney (6) and Bas Kamer (1)
* 'hotfix/participate-conferences' of https://github.com/basz/zf-web:
  include location
  update conferences