magazine
Merge remote-tracking branch 'origin/dev' into dev3

Conflicts:
	AbstraktiShooter/src/com/abstrakti/shooter/objects/GameObjectFactory.java
ammo
Merge remote-tracking branch 'origin/dev' into dev3