first pass w/ replication manager working
update test, fix a bug
feedback changes
Merge pull request #16 from jmspring/repmgr

Replication manager changes
A hacky function to support putting users into the permission DB from JS
Merge remote-tracking branch 'upstream/master'
TORIFY!!!!

Hooked up the template to Tor. This was really just work for the test cases.
Merge pull request #19 from yaronyg/master

TORIFY!
Changes to get tests running on Tor in Android as well

build.gradle - Added --enable-remote-debugging so I can actually debug the
test which is in JS

ProxyExtensionClient - Had to change logging to use native Android logging
because I couldn't include the SLF4J aar in crosswalk

Index.html - The paths were wrong so they couldn't work in Android (but
did work in Java), now fixed. Took me 3 hours to figure out this is why
nothing was working in Android. :(
Merge pull request #20 from yaronyg/master

Changes to get tests running on Tor in Android as well
Minor fluff, just preparing to try to merge with ThaliHTML5ApplicationFramework
Merge remote-tracking branch 'html5/master'

Conflicts:
	Java/build.gradle
	web/bower.json
	web/src/index.html
Little clean up so relay port specification is centralized

Added support for finding the socks proxy address
Added support for directly specifying relay port
Centralized where we declare relay port in JS to one place so we can change
 it later when we support dynamic relay ports.
Merge pull request #22 from yaronyg/master

Little clean up so relay port specification is centralized
Can now resolve onion to httpkey properly & add permission keys

Merged with HTML5 depot
Centralized where we specify relay port in prepartion for dynamic port
Added services for permission database & onion address resolution
Added a line to show the onion address when displaying a QRCode
Merge remote-tracking branch 'html5/master'

Conflicts:
	Android/src/main/java/com/msopentech/ThaliClient/ProxyExtensionClient.java
	Java/src/main/java/com/msopentech/ThaliClient/ProxyDesktop.java
	web/src/index.html
	web/src/js/tdh_replication.js