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

Conflicts:
	app/models/cabinet/trainer/finger_print.rb
#gt-114 fixed work 40m
remove _id
spec fix
stylus fix
Merge branches 'develop' and 'master' of https://github.com/KernelCorp/genetic-test into develop
#gt-117 fixed work 2h
Merge branch 'master' of https://github.com/KernelCorp/genetic-test
trainer show right even if right
Merge branch 'master' of https://github.com/KernelCorp/genetic-test
#gt-120 fixed
Merge branch 'master' of http://github.com/KernelCorp/genetic-test
#gt-119 work 40m
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/trainer_controller.rb
Merge branch 'master' of https://github.com/KernelCorp/genetic-test
add finish mail to trainer
#gt-119 fixed work 15m
#gt-118 In Progress work 1h30m
trainer style fix