fix \n
working on some meager fixes to the code.
Merge remote-tracking branch 'origin/features' into features

Conflicts:
	admin/controller.php