Merge pull request #21 from snakerock/master

Changes
* Merged translations;
* Windows faping;
* Merge;
* Merged with master;
* Winfixes;
Merge branch 'master' into master-en
*fixes
win commit
* Megre with upstream
* Fixes;
* Fixes
* Fixes