modified attacking in interactive entity
Merge branch 'master' of https://github.com/Tadimsky/vooga into fix_weapon_cooldown

Conflicts:
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/InteractiveEntity.java
fixed projectile issue
Merge pull request #27 from Tadimsky/fix_weapon_cooldown

Fix weapon cooldown. Weapon now moves with the unit again
Merge branch 'master' of https://github.com/Tadimsky/vooga into observer-pattern

Conflicts:
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/InteractiveEntity.java
	src/vooga/rts/state/GameState.java