Merged with upstream
Merge remote-tracking branch 'upstream/develop' into develop
reformatted the project pages so thesis faculty are in a 2-column div, replaced 'view project link' with icon
Merge branch 'develop-project-single' into develop
Merge pull request #46 from binaricorn/develop

Merging Fei's work on reformatting single project page