cambios
Merge branch 'master' of https://github.com/Pototex/nacionCostaRicaApp

Conflicts:
	app/src/main/res/layout-large/board_article_grid_item.xml