working on popups
Merge branch 'master' of github.com:fmeade/RUAgenda

Conflicts:
	ruagenda/www/index.html