some chenges
Merge branch 'master' of https://github.com/ifacesoft/WwwIce

Conflicts:
	Resource/Wi/Action/Layout/Landing.tpl
	Resource/Wi/Action/Layout/Main.tpl