Merge origin/master

Conflicts:
	vizitor.nb/public_html/js/ui.js