Changes made by Svetozar Toskov (s.toskov@abv.bg).
Merge branch 'test' of https://github.com/stoskov/merge-test.git into test

Conflicts:
	bl/index.html