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

Conflicts:
	Gemfile
	app/assets/javascripts/Calendar/document-ready.js.coffee
	app/assets/javascripts/user.js.coffee
	app/assets/stylesheets/home.css.scss
	app/controllers/calendar_controller.rb
	app/controllers/social_links_controller.rb
	app/controllers/users_controller.rb
	app/models/event.rb
	app/models/user.rb
	app/views/application/_header.html.haml
	app/views/calendar/index.html.haml
	app/views/layouts/application.html.haml
	app/views/layouts/calendar.html.haml
	app/views/users/_user_search_chunk.html.haml
	app/views/users/after_omniauth.html.haml
	app/views/users/index.html.haml
	app/views/users/show.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/migrate/20130722074158_create_providers.rb
	db/migrate/20130722074342_create_social_links.rb
	db/migrate/20130731093808_create_social_links.rb
	db/migrate/20130731093809_create_table_providers.rb
	db/migrate/20130731093810_delete_user_provider_uid.rb
	db/migrate/20130731093811_create_social_links.rb
	db/migrate/20130731093811_create_table_providers.rb
	db/migrate/20130731093812_add_index_social_link.rb
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	Gemfile
	app/assets/javascripts/Calendar/document-ready.js.coffee
	app/assets/javascripts/user.js.coffee
	app/assets/stylesheets/home.css.scss
	app/controllers/calendar_controller.rb
	app/controllers/social_links_controller.rb
	app/controllers/users_controller.rb
	app/models/event.rb
	app/models/user.rb
	app/views/application/_header.html.haml
	app/views/calendar/index.html.haml
	app/views/layouts/application.html.haml
	app/views/layouts/calendar.html.haml
	app/views/users/_user_search_chunk.html.haml
	app/views/users/after_omniauth.html.haml
	app/views/users/index.html.haml
	app/views/users/show.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/migrate/20130722074158_create_providers.rb
	db/migrate/20130722074342_create_social_links.rb
	db/migrate/20130731093808_create_social_links.rb
	db/migrate/20130731093809_create_table_providers.rb
	db/migrate/20130731093810_delete_user_provider_uid.rb
	db/migrate/20130731093811_create_social_links.rb
	db/migrate/20130731093811_create_table_providers.rb
	db/migrate/20130731093812_add_index_social_link.rb
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	Gemfile
	app/assets/javascripts/Calendar/document-ready.js.coffee
	app/assets/javascripts/user.js.coffee
	app/assets/stylesheets/home.css.scss
	app/controllers/calendar_controller.rb
	app/controllers/social_links_controller.rb
	app/controllers/users_controller.rb
	app/models/event.rb
	app/models/user.rb
	app/views/application/_header.html.haml
	app/views/calendar/index.html.haml
	app/views/layouts/application.html.haml
	app/views/layouts/calendar.html.haml
	app/views/users/_user_search_chunk.html.haml
	app/views/users/after_omniauth.html.haml
	app/views/users/index.html.haml
	app/views/users/show.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/migrate/20130722074158_create_providers.rb
	db/migrate/20130722074342_create_social_links.rb
	db/migrate/20130731093808_create_social_links.rb
	db/migrate/20130731093809_create_table_providers.rb
	db/migrate/20130731093810_delete_user_provider_uid.rb
	db/migrate/20130731093811_create_social_links.rb
	db/migrate/20130731093811_create_table_providers.rb
	db/migrate/20130731093812_add_index_social_link.rb
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/assets/javascripts/conversations.js.coffee
	app/assets/javascripts/social_link.js.coffee
	app/assets/javascripts/validation.coffee
	app/assets/stylesheets/home.css.scss
	app/controllers/social_links_controller.rb
	app/helpers/social_link_helper.rb
	app/models/event.rb
	app/models/social_link.rb
	app/models/user.rb
	app/views/messages/_new_message_for_list.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/migrate/20130722074158_create_providers.rb
	db/migrate/20130722074342_create_social_links.rb
	test/fixtures/social_links.yml