added algorithm with cutting prefixes
added second algorithm
added my stuff, but not integrated in rails yet
integrated my stuff, now working
JSON.parse() implementation for IE7 and earlier
removed unused class tag
removed old file
GoogleInfoProvider implemented, still buggy, DatabaseAdapter implemented

	modified:   app/helpers/database_adapter.rb
	modified:   app/helpers/information_interface.rb
	new file:   app/helpers/information_providers/google_info_provider.rb
	deleted:    app/helpers/information_providers/live_info_provider.rb
Merge branch 'development' of github.com:pse4/orange-proton into development
Implemented MDC algorithm and API for both Bing/Google and MDC

	modified:   app/helpers/database_adapter.rb
	modified:   app/helpers/information_interface.rb
	new file:   app/helpers/information_providers/database_info_provider.rb
	modified:   app/helpers/information_providers/google_info_provider.rb
	new file:   app/helpers/information_providers/mdc_info_provider.rb
changed method of getting mdc from drgprefix

	modified:   app/helpers/database_adapter.rb
	modified:   app/helpers/information_interface.rb
	modified:   app/helpers/information_providers/mdc_info_provider.rb
Improve DatabaseInterface class with instance variables for collections, rename GoogleInfoProvider to BingInfoProvider

	modified:   app/helpers/database_adapter.rb
	modified:   app/helpers/information_interface.rb
	renamed:    app/helpers/information_providers/google_info_provider.rb -> app/helpers/information_providers/bing_info_provider.rb
	modified:   app/helpers/information_providers/database_info_provider.rb
Merge branch 'development' of github.com:pse4/orange-proton into development

Conflicts:
	app/helpers/database_adapter.rb
	app/helpers/information_interface.rb

	modified:   app/helpers/database_adapter.rb
	modified:   app/helpers/information_interface.rb
	modified:   app/helpers/information_providers/mdc_info_provider.rb
added a limitation for number of fields returned by MDCInfoProvider

	modified:   app/helpers/information_providers/mdc_info_provider.rb
refactored db-adapter methods to fit DBScheme

	modified:   app/helpers/database_adapter.rb
	modified:   app/helpers/information_providers/bing_info_provider.rb
	modified:   app/helpers/information_providers/mdc_info_provider.rb
started refactoring and documenting, preparing for merge
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/helpers/database_adapter.rb
Fixed Merge

Commiter: Gian-Luca from Server

	modified:   database_adapter.rb
Merge branch 'algorithm' into development
Remove HTTP Basic Auth so requests are easier to implement for frontend

	modified:   app/api/api.rb