mike
Merge remote-tracking branch 'upstream3/master'

Conflicts:
	The Real App/src/com/example/cardsagainsthumanity/Settings.java
	The Real App/src/com/example/cardsagainsthumanity/User.java
mike