updates
Merge branch 'master' of github.com:robelkin/altconf-data

# By Thomas Kollbach
# Via Thomas Kollbach
* 'master' of github.com:robelkin/altconf-data:
  more speaker bios
  photos etc

Conflicts:
	speakers.json