Added links. Not finished yet
Merge remote-tracking branch 'origin/master'

Conflicts:
	System/Bootstrap.php
	System/Plugin/Plugin.php