tarifa & wp8
Merge branch 'master' of github.com:peutetre/zanimo-editor