resolve error reporting edge case
Merge branch 'master' into creditHistory

Conflicts:
	Branch-SDK/src/io/branch/referral/Branch.java