robotium
Merge branch 'master' of https://github.com/250gRice/250gRice.git

Conflicts:
	250gRice/src/sw/app_250grice/MainActivity.java