misc psr
Merge branch 'psr0' of https://github.com/Floxim/floxim into psr0

Conflicts:
	Controller/Component.php
	Field/Link.php
	Field/Multilink.php
	System/Fx.php
fix merge errors
Merge branch 'psr0' of https://github.com/Floxim/floxim into psr0

Conflicts:
	Admin/Controller/Admin.php
	System/Fx.php
	Template/Loader.php