test 3
model before languages implemented
templates - scheme only
Admin panel - only create
controls - category & events
Merge branch 'master' of https://github.com/fitil4e/sedmataposoka

Conflicts:
	test_code/server/page.php
Merge pull request #14 from fitil4e/master

version1