Update guard and capybara.
Merge changes.
Update rails to 3.2.16.
Update mailman and factory_girl.
Update rspec-rails.
Update sass.
Update turbolinks.
Update Ruby to 2.1.0.
user import: deleted-string -> netenv
user import: beginning to re-implement the import mechanism.
coverage badge: making coveralls silent,

i.e. suppress output in travis in order not to display the committer information publicly.
See: https://github.com/lemurheavy/coveralls-ruby/blob/master/lib/coveralls/output.rb#L111
user profile: fixing some locales.
Resolve merge conflicts.
Update Gemfile.lock
Fix forgotten merge conflict in unit test.
Update unicorn.
Update mysql2.
user import: implementing import of further profile fields.
Merge branch 'jr-gemupdates'
gem updates: updating 'therubyracer' gem in order to make 'bundle install' succeed under Mac OS Mavericks.