Exec bundle update
Merge branch 'master' of github.com:kaznum/sanataro

Conflicts:
	Gemfile.lock
Remove the dependency on view output format and just test the template name
Exec bundle update
Update Rails to 3.2.13
Remove the dependency on coffee-filter gem

This gem's functionality is in haml > 4
Exec bundle update
Loosen the version dependency of therubyracer and exec bundle update
Exec bundle update
Exec bundle update
Exec bundle update
Fix the spec about destroying an account which does not have
any relative items and credit_relations

The test failed at `rspec --seed 10616 spec'
Fix the spec which tests destroying the account which does not have
any relative items and credit_relations

The spec failed by `rspec --seed 29414 spec'
Exec bundle update
Exec bundle update and freeze the version of capybara

The latest version of capybara is not supported by the current capybara-webkit version.
Exec bundle update
Fix import failure of stylesheet by @import

[ci skip]
Fix import failure of stylesheet by @import

[ci skip]
Merge branch 'master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock
	gemfiles/Gemfile.jruby
	gemfiles/Gemfile.jruby.lock
Update capybara to 2.0.3 and exec bundle update