Merge pull request #1 from assaultcube/master

Merge - 24.01.2014