issue #30
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/onewarmcoat/onewarmcoat/app/fragments/main/VolunteerFragment.java
	app/src/main/java/org/onewarmcoat/onewarmcoat/app/fragments/main/volunteer/PickupRequestDetailFragment.java
	app/src/main/java/org/onewarmcoat/onewarmcoat/app/fragments/main/volunteer/PickupRequestsFragment.java
	app/src/main/res/values/strings.xml