some translation
tags listed
merge conflict css solved
test modified
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste