Added configuration option for the number of iterations used by the Self Test (renamed to Diagnostics).  Bumped to version 5.4 for the Play Store.
Merge branch 'master' into SCF5

Conflicts:
	AndroidManifest.xml
	README
Merge pull request #2 from banasiak/SCF5

Scf5