small fixes
small fixes
Merge branch 'develop' of github.com:mikolajgrzyb/timetracker into feature/final-roles-and-redirections

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/accounts_controller.rb
	app/controllers/devise/custom/registrations_controller.rb
	app/controllers/time_tracker_controller.rb
	app/mailers/invitation_mailer.rb
	app/models/account.rb
	app/models/user.rb
	app/views/invitation_mailer/invite.html.slim
	app/views/invitation_mailer/invite.text.slim
	app/views/static_pages/index.html.slim
	config/routes.rb
	db/schema.rb
	spec/controllers/accounts_controller_spec.rb
	spec/controllers/auth/registrations_controller_spec.rb