add missing keep annotation
more friends-related changes
handle friending self
sync friends when notifications are handled
more friend syncing
switch to new lantern-common with pending status (and branch of lantern-ui)
do not deal in kscope ads from untrusted sources. Fixes #823
update to latest lantern-ui rewrite branch
count nproxies (refs #737)
rename field
Adjust friend dialog layout and wording
handle data urls for images
update to latest lantern-ui rewrite branch
Revert "Reverting proguard merge"

This reverts commit b5009ea569534aeff3c36c36d977e4f3120e5841.

Conflicts:
	src/main/java/org/lantern/Stats.java
	src/main/java/org/lantern/state/Friends.java
remove cruft
fewer proguard warnings
fix CSP image source