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
Changes made by Svetozar Toskov (s.toskov@abv.bg).
Changes made by Svetozar Toskov (s.toskov@abv.bg).
Changes made by Svetozar Toskov (s.toskov@abv.bg).
Changes made by Svetozar Toskov (s.toskov@abv.bg).
Merge commit '8360e9814746eb24b8bd6669ded1df7628f3c8fe' into test

Conflicts:
	bl/index.html
Changes made by Svetozar Toskov (s.toskov@abv.bg).
Changes made by Svetozar Toskov (s.toskov@abv.bg).
Merge commit '86c6fbb9d30d75a8471c8d635fb41c5da18280ad' into test

Conflicts:
	bl/index.html