Merge pull request #1 from matrix-msu/master

Remove Example
Update Marea
Merge branch 'master' of https://github.com/brabawni/daea into brabawni-master

Conflicts:
	sites/aa-sites-popup.csv
Merge branch 'brabawni-master'