changed buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_details.xml
	app/src/main/res/layout/activity_home.xml
changed buttons