Refactor movement + attack

+ Melee unit not gray if he can attack after movement