Lop.
Merge remote-tracking branch 'origin/master'

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