Changed merge
Merge remote-tracking branch 'origin/master'

Conflicts:

	app/src/main/java/com/johnsimon/payback/ui/PeopleDetailDialogFragment.java