Merge branch 'development'
contact info page added
Merge branch 'add-contact-page' into development