normalize friends out to a separate TrustRelationship type
cleanup
tell client about new friends the server knows about
use find instead of get so that null is returned
Merge pull request #30 from getlantern/friends

normalize friends out to a separate TrustRelationship type
switch from MC_LANGUAGE to our own LANG parameter, since Mailchimp will probably break on languages they do not support (because they are idiots)
fix bugs in invite finalization
serialize country codes correctly (fixes #34)
Update user login resetting code.
do not crash on deleted counter group
use hmac instead of some reandom bullshit hash thing
more fixes to getlantern/lantern#488 : counters
Merge pull request #35 from getlantern/counters

more fixes to getlantern/lantern#488 : counters
Bump version to currently deployed in lanternctrl.
Merge branch 'master' into rally

Conflicts:
	src/org/lantern/data/Dao.java
First shot at documenting the rally stuff.