Merge pull request #12 from yaronyg/master

Get Thali Apps working on Android
add tdh to tdh replication
Merge pull request #13 from jmspring/tdh2tdh_rep

add tdh to tdh replication
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.