Refactored ManageActivity to pull data from FeedMap
Merge branch 'master' of https://github.com/timherman76/leggo

Conflicts:
	src/com/leggo/ManageActivity.java