using student names to get 3d portrait images
Merge branch 'develop-scans' into develop
adding images to the student listing page
Merge branch 'develop-person-page' into develop
why this no show up in the last one?
Merge branch 'develop-add-css' into develop
add fix description in project detail page, tested on
no Google Map wheel scrolling, remove weird gray bg
no Google Map wheel scrolling, remove weird gray bg
fix nav bar
Merge pull request #33 from qkbock/develop

Merging in Quincy's PR
Merge pull request #36 from palaa159/develop

Merging in Apon's PR
Merged with upstream
Fixed conflicts in main.css and single-project.php
Merge branch 'binaricorn-develop' into develop

Merging in Fei's changes after fixing conflicts
Updated db content, and fixed student thumbnail width
Features & bugfixes related to faculty. Note: requires new db 5-04-2 for faculty display

- added list of students to facutly page
- fixed bug where different writing faculty weren't displayed if thesis faculty was the same both semesters
- made faculty names links on the project detail page
Merge branch 'develop-matt' into develop

Merging in faculty-related changes
bugfixes/new features for page loading times & search results

- homepage: immediate layout for masonry!
	- added style tags to images with width/height
	- image width is hard-coded to 268, height is calculated based on this
	- changed page-load JS to run on $(document).ready instead of window.onload

- homepage: hero loads faster
	- generate the src server-side with php so that browser downloads img immediately
	- old way of using js and window.onload meant browser had to load all images first
	  before any JS code was run

- search: masonry layout with thumbnails
Merge branch 'develop-matt' into develop