new config
Merge branch 'master' of https://github.com/MOLEDesign/wwwJamaza

Conflicts:
	components/com_roksprocket/layouts/mosaic/options.xml