Facebook progress, not completed
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/budgetgame/MainActivity.java