Change the default ordering of slides in UnGroups
Comments on the inkscape plugins
Updated bundled gems

websocket-rails now uses alphanumeric connection id's so had to alter database
schema to match
Remove accidental def method name end block
Also pass original ip to forwarded websockets requests
Better handling for missing display IP addresses in hellos
Even better handling of missing display IP-addresses
Merge branch 'master' into with_slim

Conflicts:
	Gemfile.lock