Merge pull request #18 from anallely/master

Gradle task buildZip
Always resolve to its own directory; fix
Merge pull request #19 from pateketrueke/master

Always resolve to its own directory; fix
Conflict solved