Merge remote-tracking branch 'sharp/feature/making_english_as_default_language' into develop
Merge remote-tracking branch 'sharp/master' into develop
update Spanish pages for flags
Merge pull request #40 from annaszekely/feature/update_flags_spanish_page

Feature/update flags spanish page