ddd
Merge branch 'master' of http://192.168.41.177/Bonobo.Git.Server/ds
Merge branch 'master' of http://192.168.41.177/Bonobo.Git.Server/ds

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/etnlGD/Double-Shoot

Conflicts:
	AndroidManifest.xml
	src/com/doubleshoot/prefab/InPlaceAlienLoader.java
	src/com/doubleshoot/prefab/InPlaceBulletLoader.java
	src/com/doubleshoot/prefab/InPlaceRewardLoader.java
	src/com/doubleshoot/reward/RandomBulletReward.java