first steps

Conflicts:

	app/views/common/_commercial_block.html.haml