in progress
in progress
in progress
in progress
Merge branch 'develop' into feature/user-profile

* develop: (54 commits)
  some fixes
  fix translation missing
  fix company list
  fix company list
  fix cap config for new bundler
  fix tests
  Redirect if signed in ;)
  fix unicorn configs
  some layout fixes
  Redirect user to root path if user is signed in and try resign
  adding user to company
  add password
  fix before action and translate
  remove some useless
  fix tests
  add user password remind type
  fix test for books controller
  fix js
  add companies#index page layout
  fix link to user sign_in-out
  ...

Conflicts:
	app/controllers/web/account/application_controller.rb
	app/views/layouts/web/shared/_navbar.html.haml
	config/routes.rb
Merge branch 'feature/user-profile' into develop

* feature/user-profile:
  in progress
  in progress
  in progress
  in progress
fix