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

Conflicts:
	bin/classes/com/google/android/gms/R$drawable.class
	res/layout/adapted_item_layout.xml
	src/com/flag/activities/ItemsActivity.java