Update Buttons
Update Buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_v4_21_0_0.xml
	app/src/main/res/layout/fragment_senso.xml