Merging FTP and Git content. Updates include google analytics, meta tag, and some ui