add universal state collection input
Merge pull request #2 from jbmeerkat/develop

add universal state collection input
refactoring test_helper / move ActionDispatch::TestProcess from Kernel to FactoryGirl::Syntax::Default::DSL
fix state_event_input
Merge pull request #4 from JanaVPetrova/feature/fix_state_event_input

Feature/fix state event input
fix test caption and request methods
fix methods according to routes.rb
Merge pull request #5 from qblake/feature/fix-request-methods-in-test

Fix request methods in test
Merge branch 'hotfix/new_gitignore' into develop

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

* develop:
  edit gitignore

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  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
add user/decorator
add state of attending in conference
add button to confirm attend in conference
add default state when registr
Merge branch 'feature/registration_2014' into develop

* feature/registration_2014:
  add default state when registr
  add button to confirm attend in conference
  add state of attending in conference
  add user/decorator
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