Merge pull request #213 from will123195/master

sky3 compatibility
Merge pull request #214 from SkyPHP/master

5.4 compatibility
php 5.4 compat fix
Merge pull request #219 from will123195/master

fix php 5.4 warning
fix favicon
fix favicon
Merge pull request #226 from will123195/2.2

fix favicon
canonical redirect now preserves protocol
Merge pull request #227 from will123195/2.2

canonical redirect now preserves protocol
canonical redirect
Merge remote-tracking branch 'upstream/2.2' into 3.0

Conflicts:
	includes/hooks/env-ini.php
	lib/class/class.Model.php