missed a file

Missed a file in the last commit.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Chrome/unpacked/js/caap_mainloop.js
added targetting flags

added the targetting flags to the target choosing logic.
Merge pull request #175 from yinzanat/master

add targeting icons