Merge origin/master

Conflicts:
	controller/toolkit/ToolkitDetails.php
	styles/stylePlus.css
Merge origin/master