Conflict
Merge https://github.com/nskforward/cheerswedding

Conflicts:
	application/controllers/form/edituserController.php
	application/controllers/manage/edituserController.php
	application/controllers/manage/usersController.php
	application/models/EditUserForm.php
	application/models/LoginForm.php
	application/models/NewUserForm.php
	application/views/admin/general.tpl
	application/views/general.tpl
	core/DB/SQL/DataMapper.php
	core/DB/SQL/Model.php
	core/Form/AjaxResponse.php
	core/Form/ElementBuilder.php
	core/Form/ErrorText.php
	core/Form/FormBuilder.php
	core/Form/Validator.php
	core/Form/VerifyField.php
	res/css/bootstrap.css
	res/css/custom.css
Merge https://github.com/nskforward/cheerswedding

Conflicts:
	application/controllers/form/edituserController.php
	application/controllers/manage/edituserController.php
	application/controllers/manage/usersController.php
	application/models/EditUserForm.php
	application/models/LoginForm.php
	application/models/NewUserForm.php
	application/views/admin/general.tpl
	application/views/general.tpl
	core/DB/SQL/DataMapper.php
	core/DB/SQL/Model.php
	core/Form/AjaxResponse.php
	core/Form/ElementBuilder.php
	core/Form/ErrorText.php
	core/Form/FormBuilder.php
	core/Form/Validator.php
	core/Form/VerifyField.php
	res/css/bootstrap.css
	res/css/custom.css