biiiim !
Merge branch 'master' of https://github.com/guillaume-gouchon/warlords2

Conflicts:
	src/com/giggs/apps/chaos/activities/GameActivity.java