Fix bug when target our weapons
Merge branch 'master' of https://github.com/xabufr/andromede

Conflicts:
	client/app/scripts/game.js
Merge branch 'master' of https://github.com/xabufr/andromede

Conflicts:
	client/app/scripts/game/ui/uiMain.js