Added many updates, close to a release we are
Merge branch 'master' of github.com:jwolff52/AttendEase

Conflicts:
	AttendEase/db.lck
	AttendEase/log/log.ctrl
	AttendEase/log/logmirror.ctrl
	AttendEase/seg0/c10.dat
	AttendEase/seg0/c101.dat
	AttendEase/seg0/c111.dat
	AttendEase/seg0/c121.dat
	AttendEase/seg0/c130.dat
	AttendEase/seg0/c141.dat
	AttendEase/seg0/c180.dat
	AttendEase/seg0/c1a1.dat
	AttendEase/seg0/c1b1.dat
	AttendEase/seg0/c20.dat
	AttendEase/seg0/c230.dat
	AttendEase/seg0/c241.dat
	AttendEase/seg0/c251.dat
	AttendEase/seg0/c31.dat
	AttendEase/seg0/c380.dat
	AttendEase/seg0/c391.dat
	AttendEase/seg0/c3a1.dat
	AttendEase/seg0/c3b1.dat
	AttendEase/seg0/c41.dat
	AttendEase/seg0/c470.dat
	AttendEase/seg0/c481.dat
	AttendEase/seg0/c490.dat
	AttendEase/seg0/c4a1.dat
	AttendEase/seg0/c4b0.dat
	AttendEase/seg0/c4c1.dat
	AttendEase/seg0/c51.dat
	AttendEase/seg0/c60.dat
	AttendEase/seg0/c71.dat
	AttendEase/seg0/c81.dat
	AttendEase/seg0/c90.dat
	AttendEase/seg0/ca1.dat
	AttendEase/seg0/cb1.dat
	AttendEase/seg0/cc0.dat
	AttendEase/seg0/ce1.dat
	AttendEase/seg0/cf0.dat
	AttendEase/service.properties
	dist/lib/poi-3.10-FINAL-20140208.jar
	lib/poi-3.10-FINAL/poi-3.10-FINAL-20140208.jar