Mergesquashed rails4 on top of next

Conflicts:
	features/filter_panel.feature
	features/filter_panel_01.feature
	features/filter_panel_02.feature