Merge origin/master

Conflicts:
	bra/add.php
	cat/add.php
	resources/css/style.css
	resources/lib.inc.php