& seams to be deprecated - whats up with that? still workin now?
Merge branch 'master' of github.com:gebhardtdasense/system

Conflicts:
	log/log.php