Rename the root directory to lowercase. step 2/3
Merge branch 'origin/develop'

Conflicts:
	www/site/contents/keywords/cms/cms.info
	www/site/contents/keywords/php/php.info
	www/site/contents/main/keywords/php/php.info
	www/site/contents/main/main.info
	www/site/contents/news/news2/subpage/subpage.info
	www/site/library/layouts/boolive/top/menu/object/main/main.info
	www/site1/contents/main/keywords/php/php.info
	www/site1/library/layouts/Admin/Bookmarks/object/library/library.info