More progress on data gathering from web
Merge branch 'master' of https://github.com/2014DaemonDash/team-punch

Conflicts:
	RecyclePunch/src/com/teampunch/recyclepunch/FindMapActivity.java