Merge pull request #1 from decebal/develop

Develop
update gitignore
Merge branch 'master' into develop
Structured Config