javadoc local properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	context.xml
	src/edu/uw/danco/account/AccountManagerImpl.java
javadoc local properties