before merge to master
Merge branch 'admin_banners_table_index_view'

Conflicts:
	app/views/admin/banners/index.html.haml