Prep work for FromWho
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/johnsimon/payback/util/Resource.java