Merge master into modern to keep changes up to date

Steps:

git pull (update master and modern branches)
git checkout modern
git merge --no-commit master
git checkout HEAD web
cd web
rm -rf ajax css graphics includes js lang Makefile.am scripts skins tools views
cd ../
git add -A
git commit -m "message for merge"