+ comment;
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/get_claims.html
Merge remote-tracking branch 'origin/master'
without add_order and analyst;
Merge remote-tracking branch 'origin/master'