Merge branches 'wip-CLAMP-620_master' and 'wip-CLAMP-631_master' into testing_20140418
Merge branch 'CLAMP-669' into testing_20140418
CLAMP-684 allows a course to match multiple shortname searches
CLAMP-686 applies regex to validate the maxallcourse setting
CLAMP-687 santizes custom labels for filtered course lists
Merge branches 'CLAMP-684', 'CLAMP-686' and 'CLAMP-687' into FCL_20_dev
updates README.md
bumps version to 2.4.0