using ruby 2.1.2
mergeing branch master
updating and limiting gem versions
updates to fix datatables