Merge remote-tracking branch 'origin/master'

Conflicts:
	app/gen/com/example/rasp_home/R.java
	app/res/layout/fragment_home.xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 3fe1bb7d202eb2d491d8412f0291a26b4840a1d0.
Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit b82182819ef31d467f787e44aa0dde74ae28bd2d.