Rethink the way we initialize uploaders
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/src/androidTest/java/com/nightscout/android/upload/UploaderTest.java
	app/src/main/java/com/nightscout/android/upload/Uploader.java
Added test for invalid mongo uri to verify that the indicator displays properly
Merge pull request #84 from nightscout/wip/uploader-tweak

Rethink the way we initialize uploaders