fixd string
Merge branch 'master' into new_site_old_js
left menu moved to template
some fancy updatess