fixes abort in technology
Merge remote-tracking branch 'origin/master'

* origin/master:
  merge
  Security fixes in Rank controller
  merge