fixed btn remove br
change btn to text and icon
template value for 3216
fixed answer-count

Merge remote-tracking branch 'origin/integrate' into integrate

Conflicts:
	views/socketBoard.ejs
Merge remote-tracking branch 'origin/integrate' into integrate