Merge branch 'master' of C:\John Bryce\MBank with conflicts.
Fixed some actions
Some underscores

getAdminCredentials