Fixed some info stuff
Merge branch 'master' of github.com:smidig/conference-app