Merge branch 'gh-pages'

up.csv"

This reverts commit 93d32ef79f386d0fc0c49f33e6007f666fbf22e3.

Conflicts:
	sites/aa-sites-popup.csv

Conflicts:
	sites/aa-sites-popup.csv