Stuff for permissions added + ally/enemy !

Committed to master