no message
no message
Merge branch 'master' of https://github.com/Team-Tankers/Flag-android into Team-Tankers-master
no message
Merge branch 'Team-Tankers-master'

Conflicts:
	res/layout/activity_reward.xml
	src/com/flag/adapters/RewardAdapter.java