modified:   core/misc.class.php
Merge branch 'master' of github.com:xiuno/xiunophp
Merge branch 'master' of github.com:xiuno/xiunophp
Merge branch 'master' of github.com:xiuno/xiunophp
	modified:   core/core.class.php
	modified:   lib/template.class.php