Merge branch '1_0' of https://github.com/getlantern/lantern into 1_0
Pointing at branches of lantern-common and lantern-ui
Fixed version of lantern-common for 1.0 branch
Adding missing translation string closes #854
update to latest lantern-ui
update to latest lantern-ui 1_0 branch
switched version to rc1
charset fix from @cnzzr closes #1183
Added more facebook domains
Adding @starrify's fix for chromium path to 1_0
Merge branch '1_0' of github.com:getlantern/lantern into 1_0
Added akamaihd.net to whitelist
Fixed: uname option to recognize hardware architecture
Add: path_candidates for Gentoo Linux
debug logging on proxy overcomes timing issue in DefaultXmppHandlerTest that otherwise triggers Bad Gateway
removing unnecessary sleeps
Merge pull request #1198 from yegle/fix_uname

Fixed: uname option to recognize hardware architecture
Merge pull request #1199 from yegle/fix_chrome_on_gentoo

Add: path_candidates for Gentoo Linux
Reverting pull in order to release rc1. Will re-apply the merge when ready for 1.0.1.

Revert "Merge pull request #1159 from getlantern/1158"

This reverts commit 6adfce7f186dd1b97c4e9e6d58f7084eb67b1fad, reversing
changes made to b3e9a6b258bb0df43765c1c02599b703f15173e9.

Conflicts:
	src/test/java/org/lantern/endpoints/FriendEndpointTest.java
more whitelist entries