Syncing.
Merge branch 'master' of http://github.com/alivesay/omegadoom

Conflicts:
	omegadoom/plugins/default.py