Merge origin/master

Conflicts:
	bra/delete.php
	bra/edit.php
	cat/delete.php
	cat/show.php
	index.php
	resources/ajax.php
	resources/css/style.css
	resources/lib.inc.php
	resources/log.txt
	user/edit.php