Merge project page and demo