Merge remote-tracking branch 'sharp/feature/making_english_as_default_language' into develop
Merge remote-tracking branch 'sharp/master' into develop
update contact page 050714
update Spanish pages for flags
Merge branch 'develop' into feature/update_contact_page_050714

Conflicts:
	contact.html
Merge pull request #40 from annaszekely/feature/update_flags_spanish_page

Feature/update flags spanish page
Merge pull request #39 from annaszekely/feature/update_contact_page_050714

Feature/update contact page 050714