bug fix where tokenizer wasn't returning unchanged text, only where tokens had been found
some bug fixes + customizations for um theme

Conflicts:
	assets/css/public/um.css
	subjects/databases.php