Latest
Version up

Conflicts:
	app/AndroidManifest.xml
Merge branch 'master' of https://github.com/guardianproject/securereader
Better discovery of WiFi IP address - hotspot or not