from mercurial
Merge git://github.com/ifacesoft/WwwIce

Conflicts:
	Config/Ice/Core/Module.php
	Resource/Wi/Action/Index.tpl
	Resource/Wi/Action/Layout/Main.tpl

Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	Resource/Ice/Action/Layout/Main.tpl.php
	Resource/Ice/Action/Module/Create.res.php
	Source/Ice/Core/Model.php
	Source/Ice/Data/Source/Mysqli.php
small fix
del
Merge branch 'master' of https://github.com/ifacesoft/Ice
Merge branch 'master' into 0.1