heroku stuff
Update README.md

Added wiki link
Merge remote-tracking branch 'origin/master'
front mock
calling backend with conference stuff
conference and contacts stored in db