Case 7
Merge remote-tracking branch 'origin/master'

Conflicts:
	tools/simplecms/backups/pages/case-7-ajax-requests.bak.xml
	tools/simplecms/data/pages/case-7-ajax-requests.xml
	tools/simplecms/sitemap.xml
Case 7
Case 7 en 9
Merge branch 'master' of https://github.com/pawjanssen/javascript_training

Conflicts:
	tools/simplecms/backups/pages/case-7-ajax-requests.bak.xml
	tools/simplecms/data/other/pages.xml
	tools/simplecms/data/pages/case-7-ajax-requests.xml