Fixed Merge

Commiter: Gian-Luca from Server

	modified:   database_adapter.rb