Hot fix Law
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/laws/index.html.erb
Hot fix Law 2