Updating with new refactoring to depend on p2p4android
Merge branch 'v0.1.1' into production