Portal Weakness Colors
Fixing Nits
Missed one
More Nits
Nits
Show full portal capture time on tooltips
Changed all instances of Enlightenment to Enlightened
Merge pull request #300 from cmrn/bug/294

Changed all instances of Enlightenment to Enlightened
Merge pull request #292 from j16sdiz/gh-pages

Show full capture time on mouse over
Merge pull request #284 from vita10gy/weak-colors

Portal Weakness Colors
maybe fix #295
Merge branch 'gh-pages' of github.com:breunigs/ingress-intel-total-conversion into gh-pages
don’t render resources outside the view port when the render limit is about to be hit
Revert "added a renderlimit for the plugin"

This reverts commit a94bf4475ba5366c1c605ffa6e97226839a58552.
Merge branch 'upstream' into plugin

Conflicts:
	plugins/README.md
added a renderlimit