added base classes
added classes
added files
Merge branch 'master' of github.com:maximin/kproject

Conflicts:
	apps/frontend/lib/forms/registerForm.php
	apps/frontend/modules/sfGuardRegister/config/security.yml
	apps/frontend/modules/sfGuardRegister/templates/testSuccess.php
	config/doctrine/schema.yml
	lib/filter/doctrine/ServerBackupFormFilter.class.php
	lib/filter/doctrine/ServerFormFilter.class.php
	lib/filter/doctrine/SfGuardGroupFormFilter.class.php
	lib/filter/doctrine/SfGuardPermissionFormFilter.class.php
	lib/filter/doctrine/SfGuardUserFormFilter.class.php
	lib/filter/doctrine/base/BaseServerBackupFormFilter.class.php
	lib/filter/doctrine/base/BaseServerFormFilter.class.php
	lib/filter/doctrine/sfGuardUserProfileFormFilter.class.php
	lib/form/doctrine/ServerBackupForm.class.php
	lib/form/doctrine/ServerForm.class.php
	lib/form/doctrine/SfGuardGroupForm.class.php
	lib/form/doctrine/SfGuardPermissionForm.class.php
	lib/form/doctrine/SfGuardUserForm.class.php
	lib/form/doctrine/base/BaseServerBackupForm.class.php
	lib/form/doctrine/base/BaseServerForm.class.php
	lib/form/doctrine/sfGuardUserProfileForm.class.php
	lib/model/doctrine/Server.class.php
	lib/model/doctrine/ServerBackup.class.php
	lib/model/doctrine/ServerBackupTable.class.php
	lib/model/doctrine/ServerTable.class.php
	lib/model/doctrine/SfGuardForgotPassword.class.php
	lib/model/doctrine/SfGuardForgotPasswordTable.class.php
	lib/model/doctrine/SfGuardGroup.class.php
	lib/model/doctrine/SfGuardGroupPermission.class.php
	lib/model/doctrine/SfGuardGroupPermissionTable.class.php
	lib/model/doctrine/SfGuardGroupTable.class.php
	lib/model/doctrine/SfGuardPermission.class.php
	lib/model/doctrine/SfGuardPermissionTable.class.php
	lib/model/doctrine/SfGuardRememberKey.class.php
	lib/model/doctrine/SfGuardRememberKeyTable.class.php
	lib/model/doctrine/SfGuardUser.class.php
	lib/model/doctrine/SfGuardUserGroup.class.php
	lib/model/doctrine/SfGuardUserGroupTable.class.php
	lib/model/doctrine/SfGuardUserPermission.class.php
	lib/model/doctrine/SfGuardUserPermissionTable.class.php
	lib/model/doctrine/SfGuardUserTable.class.php
	lib/model/doctrine/base/BaseServer.class.php
	lib/model/doctrine/base/BaseServerBackup.class.php
	lib/model/doctrine/sfGuardUserProfile.class.php
	lib/model/doctrine/sfGuardUserProfileTable.class.php
	web/css/bootstrap.css
	web/js/bootstrap.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/lib/forms/registerForm.php
	apps/frontend/modules/sfGuardRegister/config/security.yml
	apps/frontend/modules/sfGuardRegister/templates/testSuccess.php
	lib/model/doctrine/sfDoctrineGuardPlugin/base/BasesfGuardUser.class.php
	web/css/bootstrap.css
	web/js/bootstrap.js