fix *
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/gen/com/example/rasp_home/R.java
add r.java ro gitignore
Revert "add r.java ro gitignore"

This reverts commit 26bacd77219c97207f74708eb2c443708a6be9c3.