Added popup mechanism.
Merge branch 'master' of github.com:neastin/HouseholdDashboard

Conflicts:
	index.html