második
Merge branch 'master' of https://github.com/eletkftbiatorbagy/sutipedia

Conflicts:
	www/config.xml