er
Merge branch 'newtestset' of https://github.com/maxschaf/team-cool into newtestset

Conflicts:
	lunchdroidTests-test/src/com/example/lunchdroid/test/activities/LunchdroidActivityCheckboxTest.java
	lunchdroidTests-test/src/com/example/lunchdroid/test/activities/LunchdroidActivityFavoritTest.java
	lunchdroidTests-test/src/com/example/lunchdroid/test/activities/LunchdroidActivityTest.java