Matching and transaction management jsp files complete. Only Java and
minimal Javascript work remaining.
Merge branch 'master' of https://github.com/andyehlert/ladar

Conflicts:
	WebContent/js/main.js