finger_pattern_id was added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/cabinet/trainer/finger_print.rb