Minno: #1550 fixing scroll on too many form field on adding highlights field
merge master
Minno: updating gemfile.lock
Merge pull request #463 from akash/master

merging pull req 450
Merge branch 'Story1550' of https://github.com/minhngocd/RapidFTR into pull-req-452