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

galician and basque translation added
Update app.js
Update app.js
Merge branch 'monfero-patch-1'
Merge branch 'master' into devel