Merge pull request #30 from sharpdigital/feature/spacing

balancing the spacing on the page
Merge pull request #31 from sharpdigital/feature/fix_admission_links

Feature/fix admission links
Merge pull request #32 from sharpdigital/feature/image_manipulation

Feature/image manipulation
Courses (English) page update
updating and formatting terms and conditions
Updated contact informations
Merge remote-tracking branch 'sharp/feature/making_english_as_default_language' into develop
Merge remote-tracking branch 'sharp/feature/making_english_as_default_language' into feature/insert_flags
Insert Spanish and English flags
Merge pull request #33 from annaszekely/feature/courses

Courses (English) page update
Merge branch 'master' into develop
Merge pull request #34 from PeterRigo/feature/terms_&_conditions

Feature/terms & conditions
Merge pull request #36 from PeterRigo/feature/editing_spanis_and_english_contact_informations

Feature/editing spanis and english contact informations
Merge pull request #37 from annaszekely/feature/insert_flags

Feature/insert flags
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