Merge branch 'Goran'
deleted generated zips
Merge branch 'master' into Goran