changed version number to correspond with release
Merge branch 'master' of github.com:ilios/ilios
updated CHANGELOG.txt and version.php files, ready for release 2.4.2-prerelease
Merge pull request #551 from thecoolestguy/v242_prerelease

v2.4.2-prerelease-20140407