Signed-off-by: big <you@example.com>
Merge branch 'master' of git@github.com:oksamitnyj/lubov2.git

Conflicts:
	css/add.css
	modules/booking/booking.xsl

Signed-off-by: big <you@example.com>