actualizando el framework
Merge branch 'master' of https://github.com/delimce/avalon

Conflicts:
	config/datasources.php
	lib/core/FactoryDao.php
	lib/core/Form.php
	lib/core/Security.php