Merge remote-tracking branch 'origin/master'

Conflicts:
	TheDrinkChallenge/bin/TheDrinkChallenge.apk
	TheDrinkChallenge/bin/classes.dex
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$id.class
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$integer.class
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$layout.class
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$string.class
	TheDrinkChallenge/bin/classes/com/thedrinkchallenge/www/R$style.class
	TheDrinkChallenge/bin/resources.ap_
	TheDrinkChallenge/gen/com/thedrinkchallenge/www/R.java
	TheDrinkChallenge/res/layout/take_test.xml
	TheDrinkChallenge/src/com/thedrinkchallenge/www/TakeTestAction.java