update to conversation module
Merge branch 'gh-pages' of github.com:hackerspace-silesia/gah into gh-pages

Conflicts:
	app/main.js