Update CHANGELOG.md
Update to Apache Server Configs 2.4.0
Update jQuery to v2.1.1
fixing conflicts