nemes_mocska
Merge branch 'develop' of https://github.com/erram/radzeer into develop

Conflicts:
	index.php
	protected/config/main.php