edit
editMerge branch 'master' of github.com:nathcoder/debatti

Conflicts:
	Geode/Geode/debattiFront/DetailTopic.php