Saving database transaction added for creating users (matt)
fixing merge

Merge https://github.com/HamidM250/S-Ware

Conflicts:
	app/controllers/users_controller.rb