Merge branch 'reactclient' into development

Conflicts:
	gruntfile.js
	http/socket.js
	package.json
	threader/threader.js
Merge branch 'webby' into development
Added embed mode
config.js added for ircClient, bug fixes
irc client reconnection after 1 min
	* getBotNick(roomId) implementation
	* irc config added
Merge branch 'irc-rewrite' into development

Conflicts:
	package.json
Merge branch 'revision' into development

Conflicts:
	threader/threader.js
Try to fix history
few fixes and dummy inserts.
Implemented user menu and follow room
Implementine opening and closing of conf mode
Improved reset styles and reworked grid system
Merge branch 'development' of github.com:scrollback/scrollback into development
Fixed some styles
Adding the users object to the queries in getTexts and getThreads.
Fix switches
Added defalut room permissions inside the auth rules. Changed libsb api
from getLabels to getThreads.
Merge branch 'webby' into development
Start porting settingd into js
Merge branch 'development' of github.com:scrollback/scrollback into development