upgrade rspec to 3.0 v
configurate rspec 3
upgrade rspec_api_documentation to support rspec 3.0
Merge branch 'master' into upgrade-rspec-to-3.0-issue-67

Conflicts:
	Gemfile.lock
avoid block comments in spec_helper
avoid double-quoted strings in rails_helper where it possible
remove comments
Update devise config. Fix token_authentication deprecation warnings
Do not use spaces after opening and before closing braces
Merge branch 'devise-fix-config'

Conflicts:
	config/application.rb
	config/initializers/wrap_parameters.rb
remove obvious comments from rails_helper
Merge pull request #78 from fs/upgrade-rspec-to-3.0-issue-67

upgrade rspec to 3.0 v
Merge branch 'master' into examples