adds zipcode and zone to branches
Merge branch 'dev' of github.com:farfanoide/agalma into dev