More style fixes...
Merge branch 'master' of https://github.com/arkona/content

Conflicts:
	app/controllers/add/folder.php