removed META-INF folder
Merge branch 'develop' of https://github.com/korpling/salt.git into develop