Fixed targeting stuffs and attack stuffs
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/minions/minion.lua