Merge pull request #5 from GenaBitu/develop

develop to master - 0.2
Merge branch 'develop' of https://github.com/GenaBitu/OpenStrategia into develop
Merge branch 'develop' of https://github.com/GenaBitu/OpenStrategia into develop