Inventory started
fixed untracked files
Switch to Inventory Testing
Switch to Inventory testing 2
Guns and Inventory
Inventory System V 1 Done
Fixed *Player pos after restart
Merge branch 'refs/heads/enemies' into development

Conflicts:
	gen/com/google/android/gms/R.java
	src/com/spaceshooter/game/object/player/Player.java
bug fixes
code cleaning
mantis fix