case 5
Merge branch 'master' of https://github.com/pawjanssen/javascript_training

Conflicts:
	tools/simplecms/data/other/pages.xml