Smartypants interferes with template rendering
Move upload functionality to a plugin

Conflicts:
	app/includes/uploads.php