gems updated
Multitenancy with scopes Part 1 =)
multitenancy with scopes Part 2
Multitenancy with scopes part 3
Merge branch 'master' of github.com:cirope/mawidabp

Conflicts:
	Gemfile.lock
Merge branch 'master' into multitenancy

Conflicts:
	Gemfile.lock
	app/controllers/concerns/reports/control_objective_stats.rb
	app/controllers/concerns/reports/fixed_weaknesses_report.rb
	app/controllers/concerns/reports/nonconformities_report.rb
	app/controllers/concerns/reports/process_control_stats.rb
	app/controllers/concerns/reports/weaknesses_by_audit_type.rb
	app/controllers/concerns/reports/weaknesses_by_risk.rb
	app/controllers/concerns/reports/weaknesses_by_risk_report.rb
	app/controllers/concerns/reports/weaknesses_by_state.rb
	app/controllers/detracts_controller.rb
	app/models/detract.rb
	app/models/poll.rb
	app/models/questionnaire.rb
	app/views/detracts/index.html.erb
	db/schema.rb
	test/models/detract_test.rb
	test/test_helper.rb
Fix finding follow up pdf report
Merge branch 'reports-refactor'
multitenancy with scopes part 3
cleanup finding scopes
Merge branch 'master' of github.com:cirope/mawidabp
Gemfile updated
Fixed fixture organization roles
Fixed finding controller test
Merge branch 'master' into multitenancy
Fix findings translations
Improved includes controller
Improved build search conditions
Improved includes review controller
Ignore user last_access on paper trail