First prototype for grid
Also changed markap DOM
Merge branch 'task3'

Conflicts:
	products_1.xml
	protected/runtime/application.log