add delete button
Merge branch 'master' of https://github.com/lucianojmf/NodeBB
add delete button
Merge branch 'master' of https://github.com/lucianojmf/NodeBB

Conflicts:
	src/socket.io/api-petiko.js
cleiton
Merge branch 'master' of https://github.com/lucianojmf/NodeBB
delete