Best commit ever
Merge remote-tracking branch 'origin/master'

Conflicts:
	Commands.pyc
	FSShell.pyc
	ForumDB.pyc