Adding Braum and placeholder image
Adding ip address in errors
Merge branch 'master' into developement

Conflicts:
	includes/functions.include.php