Merge branch 'master' into develop

Synched to the latest master version
Fixed nav bar status, added contact information, text for the about section and standarized orders.js to match the other html code
Merge branch 'develop' into staging

Added the structure of the about us, and contact info pages. Fixed some minor bugs in the presentation of the active page.