Merge pull request #81 from juancjara/master

update dev
spanglish
grunt
Merge pull request #82 from juancjara/development

Development