Test another height of new feeds box
Merge branch 'master' of https://github.com/npbtrac/1310-lilely

Conflicts:
	protected/runtime/application.log