changed variables
Merge branch 'master' of https://github.com/Tadimsky/vooga

Conflicts:
	src/vooga/rts/gamedesign/sprite/rtsprite/RTSprite.java
	src/vooga/rts/gamedesign/sprite/rtsprite/interactive/Interactive.java
	src/vooga/rts/gamedesign/sprite/rtsprite/interactive/units/Soldier.java
	src/vooga/rts/gamedesign/sprite/rtsprite/interactive/units/Units.java
test sounds