Merge branch 'master' of /workspace/coralgit/organizationstrunk into hesburgh

Conflicts:
	admin/configuration_sample.ini
Merge branch 'master' into hesburgh

Conflicts:
	admin/configuration_sample.ini
Merge branch 'hesburgh2' into hesburgh
Merge branch 'master' into hesburgh
trying to fix database null autoincrement issue
fixes to js - numbers in quotes, html.length, empty value - fixes to html - xhtml declaration - fixes to db objects - improve null handling
merge master
update db service
Merge branch 'master' into hesburgh
commit js fixes
fix script
fix script
fix script
fix script
fix script
fix script
fix script
fix script
fix script