Merge branch 'BenBiglariBranch' into BenBiglari

Conflicts:
	TaskBomb/bin/TaskBomb.apk
	TaskBomb/bin/classes.dex
	TaskBomb/bin/resources.ap_
	TaskBomb/gen/com/groupthirteen/taskbomb/R.java