Merge branch 'development' into anti_abuse
Merge branch 'dev/temp' into anti_abuse
Merge branch 'dev/temp' of https://github.com/scrollback/scrollback into dev/temp
Merge branch 'dev/temp' of https://github.com/scrollback/scrollback into dev/temp
added auth rules for action.room.guides, validation for room.guides
Merge branch 'dev/temp' of github.com:scrollback/scrollback into dev/temp
Fix chat message not updating
Merge branch 'dev/temp' into webby
Auto-update timestamps every minute
Fixed few bugs in room config.
The checklists are removed for now from the spam control configuration
Modification made to the checklist for the anti_abuse option
Merge branch 'dev/temp' of https://github.com/scrollback/scrollback into dev/temp
Add dot for chat message and replace nickname properly
Merge branch 'webby' into dev/temp
Merge branch 'overhaul' into dev/temp

Conflicts:
	http/http.js
	irc/irc-client.js
	ui/room-list.js
call next after ajax reply
removed client-config.js
added exception in autherizer for internal session
Merge branch 'dev/temp' into ui-refactor