Merge Master of github.com/crits/crits into sourceFieldFormCleanup