fixing edit group field population and focus
fix for user/role relationship
hardening user/group relations by adding role_type to relationships
fixes for file mgr tree delete, reload and move
adding method allow_Access to protected_with_capabilities
fixing rename file
fixing s3 manager to use is_secured?
changing has_capabilities to is_secured
bumping erp_forms
dating CHANGELOG for all engines to be pushed
Merge branch 'security'
Merge branch 'master' into rails32

Conflicts:
	erp_app/CHANGELOG
	erp_forms/lib/erp_forms/version.rb
	knitkit/CHANGELOG