Merging to the Master branch

This is a major update to the website code. This merge is for the mid-term project showcase. There will be further updates in the future.