Fixed a bunch of lies
Removed UIBeans.  Not sure how that's going to work
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt
Fixed the configs and properties files, fixed my broken invoice tests
Merge remote-tracking branch 'origin/master'