Changes in DrinkFarm
Merge remote-tracking branch 'origin/master'

Conflicts:
	TimeWaste/src/com/timewaste/timewaste/GameActivity.java