merging with master
added timeout for username ban and fixed repeat ban error