General updates. See issue #184
Merged from master.

Conflicts:
	Piranha/Areas/Manager/Content/Css/style.min.css