some stuff, still bugfixing
Merge branch 'master' of github.com:Inf1n1te/Localization