Mostly cosmetic changes
Merge branch 'master' of github.com:rboling/DigitalWallet

Conflicts:
	DigitalWallet/.classpath
	DigitalWallet/.settings/org.eclipse.jdt.core.prefs
	DigitalWallet/src/fwAuthentication/AuthenticationImpl.java
	DigitalWallet/src/fwAuthentication/AuthenticationServer.java
.gitignore