cambios

Signed-off-by: Johan <joacub@gmail.com>
Merge branch 'master' of git://github.com/joacub/zf-joacub-form-annotations

Signed-off-by: Johan <joacub@gmail.com>

Conflicts:
	config/module.config.php