Zedek Edge branch
Setting ignores
Ignoring files
corrections to views generator and 404 error
Merge branch 'stable'

Conflicts:
	.gitignore
Fixed find in model
view corrented to views in zview
Fixed wamp error warnings
Vix fixed for wamp errors
False warning!
update
Updates to doc including additional pages
3.1 {{common}} template placeholder and /themes/common folder included

3.1.1 minor theme fixes
version 3.1.3 minor fixed to model and orm
Correcting the order of variables acepted by the methods:
ZORM::exists() and ZORM::m2mExists() as well as ZModel::exists() and ZModel::pairExists()
Merge branch 'master' of /var/repo/zedek

Conflicts:
	config/config.json
	core/model.php
	core/orm.php
	internals/form.php
version 3.13