fix
Merge branch 'master' of https://github.com/kamaikin/ideya

Conflicts:
	cms/Template/Default/Front/Concept/ConceptFrontEdit.tpl
	cms/Template/Default/Front/Concept/one.tpl