caro test
Merge remote-tracking branch 'origin/master' into Caro

Conflicts:
	What2Watch/src/com/example/what2watch/User.java