sync
Merge branch 'master' of https://github.com/benkeen/birdsearch.org

Conflicts:
	modules/aboutDialog/about.js