started refactoring and documenting, preparing for merge
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/helpers/database_adapter.rb