updating setting text in masin activity
string fix
Merge branch 'master' of
https://github.com/BillRothVMware/bora-strata-mar27.git

Conflicts:
	src/com/vmware/loginsight/LogUploaderService.java