adding the nick changes to the occupants.js.
Fix to the wordban being active even after disabling it...
Merge branch 'master' of github.com:scrollback/scrollback
Removed gate
Restored simpler messages query (now that better indexing is in place)
Merge branch 'master' of github.com:scrollback/scrollback
FIxed a bug in tables6up7 script
added a timezone field for users table
Merge branch 'master' into databasePartition

Conflicts:
	core/api/message.js