Lae Categories/Subjects Features

Includes a resolved merge conflict in Gemfile.lock