Merge remote-tracking branch 'upstream/master'

Conflicts:
	assignments/week-5-assignment-4/W5-A4-Android-Test/src/edu/vuum/mocca/test/PingPongActivityTest.java