Merge branch 'production' of git.collipa.com:collipa into production

Conflicts:
	helpers.py
Merge branch 'development' into production
Merge branch 'development' into production
Merge branch 'development' into production
Merge branch 'development' into production
Merge branch 'development' into production
Merge branch 'development' into production
fix bug: fix image remove bug
Merge branch 'development' into production
fix bug: fix image remove bug
Merge branch 'development' into production
fix bug: fix topic form bug
Merge branch 'development' into production
refactor: refact websocket.js
Merge branch 'production' of git.collipa.com:/home/git/repositories/collipa into production
fix bug: fix websocket.js bug
Merge branch 'development' into production
add feature: add log
Merge branch 'development' into production
Merge branch 'development'