Added modals;
Merge origin/master

Conflicts:
	BHtml.php