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

Conflicts:
	.DS_Store
	lint.xml
	src/com/flag/models/Item.java
Merge branch 'Team-Tankers-master'

Conflicts:
	lint.xml
	src/com/flag/adapters/RewardAdapter.java