update
Merge branch 'Favorites-Group' of https://github.com/LostPointsLLC/UnitedWay into Favorites-Group

Conflicts:
	Henry/obsolete/fav_functions.js
	Henry/obsolete/getEvents.php
	Henry/obsolete/getRss.php
	Henry/obsolete/getTips.php
	Henry/testing.html
blah