mine
Merge remote-tracking branch 'origin/master'

Conflicts:
	Outfitr/bin/Outfitr.apk
	Outfitr/bin/classes.dex
	Outfitr/bin/classes/com/waters/outfitr/FollowAdapter.class
	Outfitr/project.properties
	Outfitr/src/com/waters/outfitr/FollowingActivity.java