Merge
Mergue
Merge branch 'master' of https://github.com/linuxska/repoIPE

Conflicts:
	apps/ipe/modules/curso/actions/actions.class.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardGroupPermissionTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardGroupTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardPermissionTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardRememberKeyTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardUserGroupTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardUserPermissionTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardUserTableMap.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroup.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroupPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroupPermission.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroupPermissionPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardPermission.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardPermissionPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardRememberKey.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardRememberKeyPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUser.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserGroup.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserGroupPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserPermission.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserPermissionPeer.php