saves 27.09.14
Merge branch 'master' of https://github.com/Niobij/x3
saves 03.10.14