Favicon all 'er day
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/themes/pyrocms/img/favicon.ico
Merge branch 'refs/heads/3.0/develop' into AIWS/production