buisness
Merge branch 'frontend' of https://github.com/KELbTIK/cninside into frontend

Conflicts:
	theme/default/header.tpl