Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	db/migrate/20130731093809_create_table_providers.rb
	db/migrate/20130731093810_create_table_providers.rb
	db/migrate/20130731093810_delete_user_provider_uid.rb
	db/migrate/20130731093811_create_table_providers.rb
	db/migrate/20130731093811_delete_user_provider_uid.rb
	db/migrate/20130731093812_delete_user_provider_uid.rb
Merge remote-tracking branch 'origin/master'