Minor changes
Merge branch 'master' of https://github.com/MOLEDesign/wwwJamaza

Conflicts:
	templates/tpl_j31_jamaza/custom/layouts/theme.php