.
Merge branch 'master' of github.com:PatMosby/R3V0LUT10N

Conflicts:
	BibR3V/bibjsf/src/main/webapp/index.xhtml