remove procfile
comment out ruby version for bamboo
upgrade to ruby 2.0.0 and rails 4.0.0
remove empty coffee script files
add gem 'rails_12factor'
ruby version in Gemfile
roll back strong parameters for now
authenticate to access settings
Zaloguj zamiast Sign in
adding passing test controllers and views
Merge branch 'master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/rooms_controller.rb
	app/controllers/users_controller.rb
remove magic encodings
new factory girl syntax
fixed gemfile
poprawki z warningow z testow
new domain in mailing setup
new password for mailing