fix #3
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/journal/controllers/DefaultController.php