Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'wordpress'
Merge branch 'wordpress'
Update app.js

corrección frase en euskera
Merge pull request #2 from monfero/patch-2

Update app.js
Merge branch 'master' into wordpress