elrte upload folder
elrte fixed
Index and install
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
merge Master withv US83
TinyMCE added
shop
Merge branch 'master' of github.com:imagecms/ImageCMS
gallery fixed
Merge US83 and master
sitemap xml
Merge branch 'master' of github.com:imagecms/ImageCMS into userstory83
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83