simple form
Merge branch 'master' of https://github.com/lohool/XWohi

Conflicts:
	template/simple/form.ftl