Merge branch 'hotfix/new_gitignore'

* hotfix/new_gitignore:
  new gitignore
edit gitignore
Merge branch 'develop'

* develop:
  edit gitignore

Conflicts:
	.gitignore
Merge branch 'develop'

* develop:
  add default state when registr
  add button to confirm attend in conference
  add state of attending in conference
  add user/decorator
  fix methods according to routes.rb
  fix test caption and request methods
  fix state_event_input
  refactoring test_helper / move ActionDispatch::TestProcess from Kernel to FactoryGirl::Syntax::Default::DSL
  add universal state collection input
hide sign_in and after_party in header
remove stachka_broadcast
edit title
add link about stachka 2013
Merge branch 'hotfix/remove_rudiments' into develop

* hotfix/remove_rudiments:
  add link about stachka 2013
  edit title
  remove stachka_broadcast
  hide sign_in and after_party in header
  edit gitignore