some changes
Merge branch 'master' of https://github.com/8manos/ooommm-mmmooo

Conflicts:
	template_1/cre_video.tpl
	template_1/css/style.css
	template_1/index.tpl